diff options
Diffstat (limited to 'macros/smartalign.mac')
| -rw-r--r-- | macros/smartalign.mac | 222 |
1 files changed, 112 insertions, 110 deletions
diff --git a/macros/smartalign.mac b/macros/smartalign.mac index 0f81ae87..abd496e6 100644 --- a/macros/smartalign.mac +++ b/macros/smartalign.mac @@ -38,147 +38,149 @@ USE: smartalign %imacro alignmode 1-2.nolist %ifidni %1,nop - %define __ALIGN_JMP_THRESHOLD__ 16 + %define __?ALIGN_JMP_THRESHOLD?__ 16 - %define __ALIGN_16BIT_1B__ 0x90 - %define __ALIGN_16BIT_GROUP__ 1 + %define __?ALIGN_16BIT_1B?__ 0x90 + %define __?ALIGN_16BIT_GROUP?__ 1 - %define __ALIGN_32BIT_1B__ 0x90 - %define __ALIGN_32BIT_GROUP__ 1 + %define __?ALIGN_32BIT_1B?__ 0x90 + %define __?ALIGN_32BIT_GROUP?__ 1 - %define __ALIGN_64BIT_1B__ 0x90 - %define __ALIGN_64BIT_GROUP__ 1 + %define __?ALIGN_64BIT_1B?__ 0x90 + %define __?ALIGN_64BIT_GROUP?__ 1 %elifidni %1,generic - %define __ALIGN_JMP_THRESHOLD__ 8 - - %define __ALIGN_16BIT_1B__ 0x90 - %define __ALIGN_16BIT_2B__ 0x89,0xf6 - %define __ALIGN_16BIT_3B__ 0x8d,0x74,0x00 - %define __ALIGN_16BIT_4B__ 0x8d,0xb4,0x00,0x00 - %define __ALIGN_16BIT_5B__ 0x8d,0xb4,0x00,0x00,0x90 - %define __ALIGN_16BIT_6B__ 0x8d,0xb4,0x00,0x00,0x89,0xff - %define __ALIGN_16BIT_7B__ 0x8d,0xb4,0x00,0x00,0x8d,0x7d,0x00 - %define __ALIGN_16BIT_8B__ 0x8d,0xb4,0x00,0x00,0x8d,0xbd,0x00,0x00 - %define __ALIGN_16BIT_GROUP__ 8 - - %define __ALIGN_32BIT_1B__ 0x90 - %define __ALIGN_32BIT_2B__ 0x89,0xf6 - %define __ALIGN_32BIT_3B__ 0x8d,0x76,0x00 - %define __ALIGN_32BIT_4B__ 0x8d,0x74,0x26,0x00 - %define __ALIGN_32BIT_5B__ 0x90,0x8d,0x74,0x26,0x00 - %define __ALIGN_32BIT_6B__ 0x8d,0xb6,0x00,0x00,0x00,0x00 - %define __ALIGN_32BIT_7B__ 0x8d,0xb4,0x26,0x00,0x00,0x00,0x00 - %define __ALIGN_32BIT_GROUP__ 7 - - %define __ALIGN_64BIT_1B__ 0x90 - %define __ALIGN_64BIT_2B__ 0x66,0x90 - %define __ALIGN_64BIT_3B__ 0x66,0x66,0x90 - %define __ALIGN_64BIT_4B__ 0x66,0x66,0x66,0x90 - %define __ALIGN_64BIT_GROUP__ 4 + %define __?ALIGN_JMP_THRESHOLD?__ 8 + + %define __?ALIGN_16BIT_1B?__ 0x90 + %define __?ALIGN_16BIT_2B?__ 0x89,0xf6 + %define __?ALIGN_16BIT_3B?__ 0x8d,0x74,0x00 + %define __?ALIGN_16BIT_4B?__ 0x8d,0xb4,0x00,0x00 + %define __?ALIGN_16BIT_5B?__ 0x8d,0xb4,0x00,0x00,0x90 + %define __?ALIGN_16BIT_6B?__ 0x8d,0xb4,0x00,0x00,0x89,0xff + %define __?ALIGN_16BIT_7B?__ 0x8d,0xb4,0x00,0x00,0x8d,0x7d,0x00 + %define __?ALIGN_16BIT_8B?__ 0x8d,0xb4,0x00,0x00,0x8d,0xbd,0x00,0x00 + %define __?ALIGN_16BIT_GROUP?__ 8 + + %define __?ALIGN_32BIT_1B?__ 0x90 + %define __?ALIGN_32BIT_2B?__ 0x89,0xf6 + %define __?ALIGN_32BIT_3B?__ 0x8d,0x76,0x00 + %define __?ALIGN_32BIT_4B?__ 0x8d,0x74,0x26,0x00 + %define __?ALIGN_32BIT_5B?__ 0x90,0x8d,0x74,0x26,0x00 + %define __?ALIGN_32BIT_6B?__ 0x8d,0xb6,0x00,0x00,0x00,0x00 + %define __?ALIGN_32BIT_7B?__ 0x8d,0xb4,0x26,0x00,0x00,0x00,0x00 + %define __?ALIGN_32BIT_GROUP?__ 7 + + %define __?ALIGN_64BIT_1B?__ 0x90 + %define __?ALIGN_64BIT_2B?__ 0x66,0x90 + %define __?ALIGN_64BIT_3B?__ 0x66,0x66,0x90 + %define __?ALIGN_64BIT_4B?__ 0x66,0x66,0x66,0x90 + %define __?ALIGN_64BIT_GROUP?__ 4 %elifidni %1,k8 - %define __ALIGN_JMP_THRESHOLD__ 16 - - %define __ALIGN_16BIT_1B__ 0x90 - %define __ALIGN_16BIT_2B__ 0x66,0x90 - %define __ALIGN_16BIT_3B__ 0x66,0x66,0x90 - %define __ALIGN_16BIT_4B__ 0x66,0x66,0x66,0x90 - %define __ALIGN_16BIT_GROUP__ 4 - - %define __ALIGN_32BIT_1B__ 0x90 - %define __ALIGN_32BIT_2B__ 0x66,0x90 - %define __ALIGN_32BIT_3B__ 0x66,0x66,0x90 - %define __ALIGN_32BIT_4B__ 0x66,0x66,0x66,0x90 - %define __ALIGN_32BIT_GROUP__ 4 - - %define __ALIGN_64BIT_1B__ 0x90 - %define __ALIGN_64BIT_2B__ 0x66,0x90 - %define __ALIGN_64BIT_3B__ 0x66,0x66,0x90 - %define __ALIGN_64BIT_4B__ 0x66,0x66,0x66,0x90 - %define __ALIGN_64BIT_GROUP__ 4 + %define __?ALIGN_JMP_THRESHOLD?__ 16 + + %define __?ALIGN_16BIT_1B?__ 0x90 + %define __?ALIGN_16BIT_2B?__ 0x66,0x90 + %define __?ALIGN_16BIT_3B?__ 0x66,0x66,0x90 + %define __?ALIGN_16BIT_4B?__ 0x66,0x66,0x66,0x90 + %define __?ALIGN_16BIT_GROUP?__ 4 + + %define __?ALIGN_32BIT_1B?__ 0x90 + %define __?ALIGN_32BIT_2B?__ 0x66,0x90 + %define __?ALIGN_32BIT_3B?__ 0x66,0x66,0x90 + %define __?ALIGN_32BIT_4B?__ 0x66,0x66,0x66,0x90 + %define __?ALIGN_32BIT_GROUP?__ 4 + + %define __?ALIGN_64BIT_1B?__ 0x90 + %define __?ALIGN_64BIT_2B?__ 0x66,0x90 + %define __?ALIGN_64BIT_3B?__ 0x66,0x66,0x90 + %define __?ALIGN_64BIT_4B?__ 0x66,0x66,0x66,0x90 + %define __?ALIGN_64BIT_GROUP?__ 4 %elifidni %1,k7 - %define __ALIGN_JMP_THRESHOLD__ 16 - - %define __ALIGN_16BIT_1B__ 0x90 - %define __ALIGN_16BIT_2B__ 0x66,0x90 - %define __ALIGN_16BIT_3B__ 0x66,0x66,0x90 - %define __ALIGN_16BIT_4B__ 0x66,0x66,0x66,0x90 - %define __ALIGN_64BIT_GROUP__ 4 - - %define __ALIGN_32BIT_1B__ 0x90 - %define __ALIGN_32BIT_2B__ 0x8b,0xc0 - %define __ALIGN_32BIT_3B__ 0x8d,0x04,0x20 - %define __ALIGN_32BIT_4B__ 0x8d,0x44,0x20,0x00 - %define __ALIGN_32BIT_5B__ 0x8d,0x44,0x20,0x00,0x90 - %define __ALIGN_32BIT_6B__ 0x8d,0x80,0x00,0x00,0x00,0x00 - %define __ALIGN_32BIT_7B__ 0x8d,0x04,0x05,0x00,0x00,0x00,0x00 - %define __ALIGN_32BIT_GROUP__ 7 - - %define __ALIGN_64BIT_1B__ 0x90 - %define __ALIGN_64BIT_2B__ 0x66,0x90 - %define __ALIGN_64BIT_3B__ 0x66,0x66,0x90 - %define __ALIGN_64BIT_4B__ 0x66,0x66,0x66,0x90 - %define __ALIGN_64BIT_GROUP__ 4 + %define __?ALIGN_JMP_THRESHOLD?__ 16 + + %define __?ALIGN_16BIT_1B?__ 0x90 + %define __?ALIGN_16BIT_2B?__ 0x66,0x90 + %define __?ALIGN_16BIT_3B?__ 0x66,0x66,0x90 + %define __?ALIGN_16BIT_4B?__ 0x66,0x66,0x66,0x90 + %define __?ALIGN_64BIT_GROUP?__ 4 + + %define __?ALIGN_32BIT_1B?__ 0x90 + %define __?ALIGN_32BIT_2B?__ 0x8b,0xc0 + %define __?ALIGN_32BIT_3B?__ 0x8d,0x04,0x20 + %define __?ALIGN_32BIT_4B?__ 0x8d,0x44,0x20,0x00 + %define __?ALIGN_32BIT_5B?__ 0x8d,0x44,0x20,0x00,0x90 + %define __?ALIGN_32BIT_6B?__ 0x8d,0x80,0x00,0x00,0x00,0x00 + %define __?ALIGN_32BIT_7B?__ 0x8d,0x04,0x05,0x00,0x00,0x00,0x00 + %define __?ALIGN_32BIT_GROUP?__ 7 + + %define __?ALIGN_64BIT_1B?__ 0x90 + %define __?ALIGN_64BIT_2B?__ 0x66,0x90 + %define __?ALIGN_64BIT_3B?__ 0x66,0x66,0x90 + %define __?ALIGN_64BIT_4B?__ 0x66,0x66,0x66,0x90 + %define __?ALIGN_64BIT_GROUP?__ 4 %elifidni %1,p6 - %define __ALIGN_JMP_THRESHOLD__ 16 - - %define __ALIGN_16BIT_1B__ 0x90 - %define __ALIGN_16BIT_2B__ 0x66,0x90 - %define __ALIGN_16BIT_3B__ 0x0f,0x1f,0x00 - %define __ALIGN_16BIT_4B__ 0x0f,0x1f,0x40,0x00 - %define __ALIGN_16BIT_GROUP__ 4 - - %define __ALIGN_32BIT_1B__ 0x90 - %define __ALIGN_32BIT_2B__ 0x66,0x90 - %define __ALIGN_32BIT_3B__ 0x0f,0x1f,0x00 - %define __ALIGN_32BIT_4B__ 0x0f,0x1f,0x40,0x00 - %define __ALIGN_32BIT_5B__ 0x0f,0x1f,0x44,0x00,0x00 - %define __ALIGN_32BIT_6B__ 0x66,0x0f,0x1f,0x44,0x00,0x00 - %define __ALIGN_32BIT_7B__ 0x0f,0x1f,0x80,0x00,0x00,0x00,0x00 - %define __ALIGN_32BIT_8B__ 0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00 - %define __ALIGN_32BIT_GROUP__ 8 - - %define __ALIGN_64BIT_1B__ 0x90 - %define __ALIGN_64BIT_2B__ 0x66,0x90 - %define __ALIGN_64BIT_3B__ 0x0f,0x1f,0x00 - %define __ALIGN_64BIT_4B__ 0x0f,0x1f,0x40,0x00 - %define __ALIGN_64BIT_5B__ 0x0f,0x1f,0x44,0x00,0x00 - %define __ALIGN_64BIT_6B__ 0x66,0x0f,0x1f,0x44,0x00,0x00 - %define __ALIGN_64BIT_7B__ 0x0f,0x1f,0x80,0x00,0x00,0x00,0x00 - %define __ALIGN_64BIT_8B__ 0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00 - %define __ALIGN_64BIT_GROUP__ 8 + %define __?ALIGN_JMP_THRESHOLD?__ 16 + + %define __?ALIGN_16BIT_1B?__ 0x90 + %define __?ALIGN_16BIT_2B?__ 0x66,0x90 + %define __?ALIGN_16BIT_3B?__ 0x0f,0x1f,0x00 + %define __?ALIGN_16BIT_4B?__ 0x0f,0x1f,0x40,0x00 + %define __?ALIGN_16BIT_GROUP?__ 4 + + %define __?ALIGN_32BIT_1B?__ 0x90 + %define __?ALIGN_32BIT_2B?__ 0x66,0x90 + %define __?ALIGN_32BIT_3B?__ 0x0f,0x1f,0x00 + %define __?ALIGN_32BIT_4B?__ 0x0f,0x1f,0x40,0x00 + %define __?ALIGN_32BIT_5B?__ 0x0f,0x1f,0x44,0x00,0x00 + %define __?ALIGN_32BIT_6B?__ 0x66,0x0f,0x1f,0x44,0x00,0x00 + %define __?ALIGN_32BIT_7B?__ 0x0f,0x1f,0x80,0x00,0x00,0x00,0x00 + %define __?ALIGN_32BIT_8B?__ 0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00 + %define __?ALIGN_32BIT_GROUP?__ 8 + + %define __?ALIGN_64BIT_1B?__ 0x90 + %define __?ALIGN_64BIT_2B?__ 0x66,0x90 + %define __?ALIGN_64BIT_3B?__ 0x0f,0x1f,0x00 + %define __?ALIGN_64BIT_4B?__ 0x0f,0x1f,0x40,0x00 + %define __?ALIGN_64BIT_5B?__ 0x0f,0x1f,0x44,0x00,0x00 + %define __?ALIGN_64BIT_6B?__ 0x66,0x0f,0x1f,0x44,0x00,0x00 + %define __?ALIGN_64BIT_7B?__ 0x0f,0x1f,0x80,0x00,0x00,0x00,0x00 + %define __?ALIGN_64BIT_8B?__ 0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00 + %define __?ALIGN_64BIT_GROUP?__ 8 %else %error unknown alignment mode: %1 %endif %ifnempty %2 %ifidni %2,nojmp - %xdefine __ALIGN_JMP_THRESHOLD__ -1 + %xdefine __?ALIGN_JMP_THRESHOLD?__ -1 %else - %xdefine __ALIGN_JMP_THRESHOLD__ %2 + %xdefine __?ALIGN_JMP_THRESHOLD?__ %2 %endif %endif - %xdefine __ALIGNMODE__ %1,__ALIGN_JMP_THRESHOLD__ + %xdefine __?ALIGNMODE?__ %1,__?ALIGN_JMP_THRESHOLD?__ %endmacro +%defalias __ALIGNMODE__ __?ALIGNMODE?__ + %unimacro align 1-2+.nolist %imacro align 1-2+.nolist sectalign %1 ; align a segment as well %ifnempty %2 times (((%1) - (($-$$) % (%1))) % (%1)) %2 - %elif __PASS__ == 0 || __PASS__ == 3 + %elif __?PASS?__ == 0 || __?PASS?__ == 3 times (((%1) - (($-$$) % (%1))) % (%1)) nop %else %push %assign %$pad (((%1) - (($-$$) % (%1))) % (%1)) - %if __ALIGN_JMP_THRESHOLD__ != -1 && %$pad > __ALIGN_JMP_THRESHOLD__ + %if __?ALIGN_JMP_THRESHOLD?__ != -1 && %$pad > __?ALIGN_JMP_THRESHOLD?__ jmp %$end ; We can't re-use %$pad here as $ will have changed! times (((%1) - (($-$$) % (%1))) % (%1)) nop %else - times (%$pad / __ALIGN_%[__BITS__]BIT_GROUP__) \ - db __ALIGN_%[__BITS__]BIT_%[__ALIGN_%[__BITS__]BIT_GROUP__]B__ - %assign %$pad %$pad % __ALIGN_%[__BITS__]BIT_GROUP__ + times (%$pad / __?ALIGN_%[__?BITS?__]BIT_GROUP?__) \ + db __?ALIGN_%[__?BITS?__]BIT_%[__?ALIGN_%[__?BITS?__]BIT_GROUP?__]B?__ + %assign %$pad %$pad % __?ALIGN_%[__?BITS?__]BIT_GROUP?__ %if %$pad > 0 - db __ALIGN_%[__BITS__]BIT_%[%$pad]B__ + db __?ALIGN_%[__?BITS?__]BIT_%[%$pad]B?__ %endif %endif %$end: |