diff options
| author | Victor van den Elzen <victor.vde@gmail.com> | 2008-10-01 13:16:26 +0200 |
|---|---|---|
| committer | Victor van den Elzen <victor.vde@gmail.com> | 2008-10-01 13:21:02 +0200 |
| commit | fd49408ed9a0250f085ff41bef1fe48423447245 (patch) | |
| tree | 4c8786274f40eb2bb3fab455731f1602a7fe4cae | |
| parent | 4c9d6220b4b9047c7882c259d1a1d638941cd750 (diff) | |
| download | nasm-fd49408ed9a0250f085ff41bef1fe48423447245.tar.gz | |
Already aligned aligns should be 0 bytes, not %1.
| -rw-r--r-- | macros/smartalign.mac | 6 | ||||
| -rw-r--r-- | standard.mac | 6 | ||||
| -rw-r--r-- | test/align13.asm | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/macros/smartalign.mac b/macros/smartalign.mac index 2c45d284..f2ae104b 100644 --- a/macros/smartalign.mac +++ b/macros/smartalign.mac @@ -161,14 +161,14 @@ USE: smartalign %unimacro align 1-2+.nolist %imacro align 1-2+.nolist %ifnempty %2 - times ((%1) - (($-$$) % (%1))) %2 + times (((%1) - (($-$$) % (%1))) % (%1)) %2 %else %push - %assign %$pad (%1) - (($-$$) % (%1)) + %assign %$pad (((%1) - (($-$$) % (%1))) % (%1)) %if %$pad > __ALIGN_JMP_THRESHOLD__ jmp %$end ; We can't re-use %$pad here as $ will have changed! - times ((%1) - (($-$$) % (%1))) nop + times (((%1) - (($-$$) % (%1))) % (%1)) nop %$end: %else %if __BITS__ == 16 diff --git a/standard.mac b/standard.mac index b3e4ae3a..0faa1876 100644 --- a/standard.mac +++ b/standard.mac @@ -66,13 +66,13 @@ __SECT__ %endmacro %imacro align 1-2+.nolist nop - times ((%1) - (($-$$) % (%1))) %2 + times (((%1) - (($-$$) % (%1))) % (%1)) %2 %endmacro %imacro alignb 1-2+.nolist %ifempty %2 - resb ((%1) - (($-$$) % (%1))) + resb (((%1) - (($-$$) % (%1))) % (%1)) %else - times ((%1) - (($-$$) % (%1))) %2 + times (((%1) - (($-$$) % (%1))) % (%1)) %2 %endif %endmacro diff --git a/test/align13.asm b/test/align13.asm index cfc5c689..556373fc 100644 --- a/test/align13.asm +++ b/test/align13.asm @@ -11,5 +11,6 @@ inc eax inc eax align 13 + align 13 ;should do nothing inc eax inc eax |