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

BR3058845: mostly fix bogus warning with implicit operand size override

Browse Source 
The implicit operand size override code didn't set the operand size
prefix, which confused the size calculation code for the range check.

The BITS 64 operand size calculation is still off, but "fixing" it by
making it 32-bit unless REX.W is set breaks PUSH and maybe others.
This commit is contained in:
Victor van den Elzen 2010-11-07 19:56:14 +01:00 committed by Cyrill Gorcunov
parent e635491941
commit 41f1f2badc
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
assemble.c
View File

@ -1636,22 +1636,32 @@ static void gencode(int32_t segment, int64_t offset, int bits,
break;
case 0320:
if (bits != 16) {
{
enum prefixes pfx = ins->prefixes[PPS_OSIZE];
if (pfx != P_O16 && pfx != P_none)
nasm_error(ERR_WARNING, "Invalid operand size prefix");
if (pfx != P_O16 && bits != 16) {
ins->prefixes[PPS_OSIZE] = P_O16;
*bytes = 0x66;
out(offset, segment, bytes, OUT_RAWDATA, 1, NO_SEG, NO_SEG);
offset += 1;
} else
offset += 0;
}
break;
}
case 0321:
if (bits == 16) {
{
enum prefixes pfx = ins->prefixes[PPS_OSIZE];
if (pfx != P_O32 && pfx != P_none)
nasm_error(ERR_WARNING, "Invalid operand size prefix");
if (pfx != P_O32 && bits == 16) {
ins->prefixes[PPS_OSIZE] = P_O32;
*bytes = 0x66;
out(offset, segment, bytes, OUT_RAWDATA, 1, NO_SEG, NO_SEG);
offset += 1;
} else
offset += 0;
}
break;
}
case 0322:
case 0323:

14
test/br3058845.asm Normal file
View File

@ -0,0 +1,14 @@
;Testname=unoptimized; Arguments=-O0 -fbin -obr3058845.bin; Files=stdout stderr br3058845.bin
;Testname=optimized; Arguments=-Ox -fbin -obr3058845.bin; Files=stdout stderr br3058845.bin
BITS 16
cmp ax, 0xFFFF
cmp eax, 0xFFFF_FFFF
BITS 32
cmp ax, 0xFFFF
cmp eax, 0xFFFF_FFFF
BITS 64
cmp ax, 0xFFFF
cmp eax, 0xFFFF_FFFF ; shouldn't warn, but does currently