LuaJIT
/
LuaJIT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FFI: Show address pointed to for tostring(pointer).

master
Mike Pall 2011-06-07 20:57:32 +02:00
parent 51ee3d951e
commit a7ca722dca
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib_ffi.c
View File

@ -268,9 +268,10 @@ LJLIB_CF(ffi_meta___tostring)
GCcdata *cd = ffi_checkcdata(L, 1);
const char *msg = "cdata<%s>: %p";
CTypeID id = cd->typeid;
void *p = cdataptr(cd);
if (id == CTID_CTYPEID) {
msg = "ctype<%s>";
id = *(CTypeID *)cdataptr(cd);
id = *(CTypeID *)p;
} else {
CType *ct = ctype_raw(ctype_cts(L), id);
if (ctype_iscomplex(ct->info)) {
@ -286,9 +287,13 @@ LJLIB_CF(ffi_meta___tostring)
cTValue *tv = lj_ctype_meta(cts, id, MM_tostring);
if (tv)
return lj_meta_tailcall(L, tv);
} else if (ctype_isptr(ct->info)) {
p = cdata_getptr(p, ct->size);
} else if (ctype_isfunc(ct->info)) {
p = *(void **)p;
}
}
lj_str_pushf(L, msg, strdata(lj_ctype_repr(L, id, NULL)), cdataptr(cd));
lj_str_pushf(L, msg, strdata(lj_ctype_repr(L, id, NULL)), p);
checkgc:
lj_gc_check(L);
return 1;

4
src/lj_str.c
View File

@ -361,8 +361,8 @@ const char *lj_str_pushvf(lua_State *L, const char *fmt, va_list argp)
ptrdiff_t p = (ptrdiff_t)(va_arg(argp, void *));
ptrdiff_t i, lasti = 2+FMTP_CHARS;
#if LJ_64
if ((p >> 32) == 0) /* Shorten output for true 32 bit pointers. */
lasti = 2+2*4;
/* Shorten output for 64 bit pointers. */
lasti = 2+2*4+((p >> 32) ? 2+2*(lj_fls((uint32_t)(p >> 32))>>3) : 0);
#endif
buf[0] = '0';
buf[1] = 'x';