mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2024-11-21 03:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

disasm: relative operands are signed, not unsigned

Browse Source 
Relative operands are signed, not unsigned; record them as such and
then apply proper truncation after offset addition.
This commit is contained in:
H. Peter Anvin 2008-01-02 12:19:41 -08:00
parent b8b1a61d10
commit 08367e2231
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
disasm.c
View File

@ -350,7 +350,7 @@ static uint8_t *do_ea(uint8_t *data, int modrm, int asize,
break;
case 2:
op->segment |= SEG_DISP32;
op->offset = getu32(data);
op->offset = gets32(data);
data += 4;
break;
}
@ -557,11 +557,11 @@ static int matches(const struct itemplate *t, uint8_t *data,
case4(064):
opx->segment |= SEG_RELATIVE;
if (osize == 16) {
opx->offset = getu16(data);
opx->offset = gets16(data);
data += 2;
opx->segment &= ~(SEG_32BIT|SEG_64BIT);
} else if (osize == 32) {
opx->offset = getu32(data);
opx->offset = gets32(data);
data += 4;
opx->segment &= ~SEG_64BIT;
opx->segment |= SEG_32BIT;
@ -574,7 +574,7 @@ static int matches(const struct itemplate *t, uint8_t *data,
break;
case4(070):
opx->offset = getu32(data);
opx->offset = gets32(data);
data += 4;
opx->segment |= SEG_32BIT | SEG_RELATIVE;
break;
@ -1096,6 +1096,9 @@ int32_t disasm(uint8_t *data, char *output, int outbufsize, int segsize,
*/
if (!(o->segment & (SEG_32BIT|SEG_64BIT)))
offs &= 0xffff;
else if (segsize != 64)
offs &= 0xffffffff;
/*
* add sync marker, if autosync is on
*/