summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-11-15 10:25:52 -0800
committerH. Peter Anvin <hpa@zytor.com>2007-11-15 10:25:52 -0800
commit428fd671ec9d10095ce3a52c7b50276a63f377ae (patch)
tree59e262efab9ed4a7d9199667885d1d4a0757f14b
parent604a3f4e219df8a0bc2e1b2ff355e9e3ea98eb69 (diff)
downloadnasm-428fd671ec9d10095ce3a52c7b50276a63f377ae.tar.gz
Remove some vestiges of "native" RESW/RESD support
We now internally convert all RESx opcodes to RESB, so we don't need support for that in the assembler.
-rw-r--r--assemble.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/assemble.c b/assemble.c
index 2d24e8d7..5670a5cf 100644
--- a/assemble.c
+++ b/assemble.c
@@ -998,13 +998,11 @@ static int64_t calcsize(int32_t segment, int64_t offset, int bits,
case 0335:
break;
case 0340:
- case 0341:
- case 0342:
if (ins->oprs[0].segment != NO_SEG)
errfunc(ERR_NONFATAL, "attempt to reserve non-constant"
" quantity of BSS space");
else
- length += ins->oprs[0].offset << (c & 3);
+ length += ins->oprs[0].offset;
break;
case 0364:
case 0365:
@@ -1556,12 +1554,10 @@ static void gencode(int32_t segment, int64_t offset, int bits,
break;
case 0340:
- case 0341:
- case 0342:
if (ins->oprs[0].segment != NO_SEG)
errfunc(ERR_PANIC, "non-constant BSS size in pass two");
else {
- int64_t size = ins->oprs[0].offset << (c & 3);
+ int64_t size = ins->oprs[0].offset;
if (size > 0)
out(offset, segment, NULL,
OUT_RESERVE, size, NO_SEG, NO_SEG);