UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed a bug with stub offsets being calculated wrong

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%4050
This commit is contained in:
David Anderson 2006-08-01 19:49:33 +00:00
parent 119939590d
commit a9b3da5904
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sourcepawn/compiler/pawncc.c
View File

@ -174,17 +174,19 @@ int main(int argc, char *argv[])
{ {
sp_file_publics_t *pbtbl; sp_file_publics_t *pbtbl;
AMX_FUNCSTUBNT *stub; AMX_FUNCSTUBNT *stub;
unsigned char *stubptr;
uint32_t publics = sections[FS_Publics]; uint32_t publics = sections[FS_Publics];
pbtbl = (sp_file_publics_t *)malloc(sizeof(sp_file_publics_t) * publics); pbtbl = (sp_file_publics_t *)malloc(sizeof(sp_file_publics_t) * publics);
stub = (AMX_FUNCSTUBNT *)((unsigned char *)hdr + hdr->publics); stubptr = (unsigned char *)hdr + hdr->publics;
for (i=0; i<publics; i++) for (i=0; i<publics; i++)
{ {
stub = (AMX_FUNCSTUBNT *)stubptr;
pbtbl[i].address = stub->address; pbtbl[i].address = stub->address;
pbtbl[i].name = stub->nameofs - (hdr->nametable + sizeof(uint16_t)); pbtbl[i].name = stub->nameofs - (hdr->nametable + sizeof(uint16_t));
stub += hdr->defsize; stubptr += hdr->defsize;
} }
if (publics) if (publics)
{ {
@ -199,17 +201,19 @@ int main(int argc, char *argv[])
{ {
sp_file_pubvars_t *pbvars; sp_file_pubvars_t *pbvars;
AMX_FUNCSTUBNT *stub; AMX_FUNCSTUBNT *stub;
unsigned char *stubptr;
uint32_t pubvars = sections[FS_Pubvars]; uint32_t pubvars = sections[FS_Pubvars];
pbvars = (sp_file_pubvars_t *)malloc(sizeof(sp_file_pubvars_t) * pubvars); pbvars = (sp_file_pubvars_t *)malloc(sizeof(sp_file_pubvars_t) * pubvars);
stub = (AMX_FUNCSTUBNT *)((unsigned char *)hdr + hdr->pubvars); stubptr = (unsigned char *)hdr + hdr->pubvars;
for (i=0; i<pubvars; i++) for (i=0; i<pubvars; i++)
{ {
stub = (AMX_FUNCSTUBNT *)stubptr;
pbvars[i].address = stub->address; pbvars[i].address = stub->address;
pbvars[i].name = stub->nameofs - (hdr->nametable + sizeof(uint16_t)); pbvars[i].name = stub->nameofs - (hdr->nametable + sizeof(uint16_t));
stub += hdr->defsize; stubptr += hdr->defsize;
} }
if (pubvars) if (pubvars)
{ {
@ -223,16 +227,18 @@ int main(int argc, char *argv[])
{ {
sp_file_natives_t *nvtbl; sp_file_natives_t *nvtbl;
AMX_FUNCSTUBNT *stub; AMX_FUNCSTUBNT *stub;
unsigned char *stubptr;
uint32_t natives = (hdr->libraries - hdr->natives) / hdr->defsize; uint32_t natives = (hdr->libraries - hdr->natives) / hdr->defsize;
nvtbl = (sp_file_natives_t *)malloc(sizeof(sp_file_natives_t) * natives); nvtbl = (sp_file_natives_t *)malloc(sizeof(sp_file_natives_t) * natives);
stub = (AMX_FUNCSTUBNT *)((unsigned char *)hdr + hdr->natives); stubptr = (unsigned char *)hdr + hdr->natives;
for (i=0; i<natives; i++) for (i=0; i<natives; i++)
{ {
stub = (AMX_FUNCSTUBNT *)stubptr;
nvtbl[i].name = stub->nameofs - (hdr->nametable + sizeof(uint16_t)); nvtbl[i].name = stub->nameofs - (hdr->nametable + sizeof(uint16_t));
stub += hdr->defsize; stubptr += hdr->defsize;
} }
if (natives) if (natives)
{ {