hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added System>>backtrace

Browse Source
This commit is contained in:
hyunghwan.chung
2019-07-12 07:24:37 +00:00
parent 18e186677e
commit 3e506cbcfb
8 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
moo/lib/debug.c
View File

@ -241,9 +241,9 @@ int moo_addmethodtodbgi (moo_t* moo, moo_oow_t file_offset, moo_oow_t class_offs
di->_file = file_offset;
di->_class = class_offset;
di->start_line = start_line;
di->code_loc_start = name_bytes_aligned;
di->code_loc_start = name_bytes_aligned; /* distance from the beginning of the variable payload */
di->code_loc_len = code_loc_len;
di->text_start = name_bytes_aligned + code_loc_bytes_aligned;
di->text_start = name_bytes_aligned + code_loc_bytes_aligned; /* distance from the beginning of the variable payload */
di->text_len = text_len;
curptr = (moo_uint8_t*)(di + 1);

5
moo/lib/exec.c
View File

@ -2228,7 +2228,7 @@ static MOO_INLINE moo_dbgi_method_t* get_dbgi_method (moo_t* moo, moo_oop_method
if (dbgi_method_offset > 0)
{
MOO_ASSERT (moo, dbgi_method_offset < moo->dbgi->_len);
di = (moo_dbgi_method_t*)&((moo_uint8_t*)moo->dbgi)[dbgi_method_offset];
di = (moo_dbgi_method_t*)MOO_DBGI_GET_DATA(moo, dbgi_method_offset);
MOO_ASSERT (moo, MOO_DBGI_GET_TYPE_CODE(di->_type) == MOO_DBGI_TYPE_CODE_METHOD);
}
}
@ -2258,7 +2258,7 @@ static moo_pfrc_t pf_method_get_source_file (moo_t* moo, moo_mod_t* mod, moo_ooi
const moo_ooch_t* file_name;
MOO_ASSERT (moo, dbgi_file_offset < moo->dbgi->_len);
di = (moo_dbgi_file_t*)&((moo_uint8_t*)moo->dbgi)[dbgi_file_offset];
di = (moo_dbgi_file_t*)MOO_DBGI_GET_DATA(moo, dbgi_file_offset);
MOO_ASSERT (moo, MOO_DBGI_GET_TYPE_CODE(di->_type) == MOO_DBGI_TYPE_CODE_FILE);
file_name = (const moo_ooch_t*)(di + 1);
@ -2300,7 +2300,6 @@ static moo_pfrc_t pf_method_get_ip_source_line (moo_t* moo, moo_mod_t* mod, moo_
retv = moo_oowtoint(moo, code_loc_ptr[ipv]);
if (!retv) return MOO_PF_FAILURE;
}
/* TODO: security check for data corruption? check if the ipv offset and the size calcualted doesn't exceed di->_len... */
}
MOO_STACK_SETRET (moo, nargs, retv);

2
moo/lib/moo.h
View File

@ -973,6 +973,8 @@ typedef enum moo_dbgi_type_t moo_dbgi_type_t;
#define MOO_DBGI_GET_TYPE_CODE(type) ((type) >> 8)
#define MOO_DBGI_GET_TYPE_FLAGS(type) ((type) & 0xFF)
#define MOO_DBGI_GET_DATA(moo, offset) ((moo_uint8_t*)(moo)->dbgi + (offset))
typedef struct moo_dbgi_file_t moo_dbgi_file_t;
struct moo_dbgi_file_t
{