mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-04-12 18:40:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unbreak relative references to immediate addresses

Browse Source 
Remove bogus "treat labels different from immediates" code, which
would result in generating of a relative mod/rm but without adjusting
the address accordingly.

Update addressing mode test.
This commit is contained in:
H. Peter Anvin 2007-09-28 17:17:20 -07:00
parent 43827654ac
commit d0b0d28f42
3 changed files with 1200 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assemble.c
View File

@ -1601,10 +1601,9 @@ static void gencode(int32_t segment, int32_t offset, int bits,
case 2:
case 4:
data = ins->oprs[(c >> 3) & 7].offset;
if (ea_data.rip && (ins->oprs[(c >> 3) & 7].segment == 0xFFFFFFFF))
ea_data.rip = 0; /* Make distinction between Symbols and Immediates */
out(offset, segment, &data, /* RIP = Relative, not Absolute */
(ea_data.rip ? OUT_REL4ADR : OUT_ADDRESS) + ea_data.bytes,
out(offset, segment, &data,
(ea_data.rip ? OUT_REL4ADR : OUT_ADDRESS)
+ ea_data.bytes,
ins->oprs[(c >> 3) & 7].segment,
ins->oprs[(c >> 3) & 7].wrt);
s += ea_data.bytes;

1188
test/riprel.asm
View File

File diff suppressed because it is too large Load Diff

16
test/riprel.pl
View File

@ -5,15 +5,17 @@ print "\tbits 64\n";
foreach $mode ('abs', 'rel') {
print "\n\tdefault $mode\n\n";
foreach $rq ('', 'abs ', 'rel ') {
foreach $sq ('', 'dword ', 'qword ') {
foreach $v ('foo', '0xaaaaaaaaaaaaaaaa', '0xbbbbbbbb',
'0xffffffffcccccccc') {
foreach $r ('al', 'bl', 'ax', 'bx', 'eax', 'ebx', 'rax', 'rbx') {
print "\tmov $r,[$rq$sq$v]\n";
foreach $so ('', 'fs:', 'es:') {
foreach $rq ('', 'abs ', 'rel ') {
foreach $sq ('', 'dword ', 'qword ') {
foreach $v ('foo', '0xaaaaaaaaaaaaaaaa', '0xbbbbbbbb',
'0xffffffffcccccccc') {
foreach $r ('al', 'bl', 'ax', 'bx', 'eax', 'ebx', 'rax', 'rbx') {
print "\tmov $r,[$rq$sq$so$v]\n";
}
}
print "\n";
}
print "\n";
}
}
}