Implement the base offset parameter to 'struc'

diff --git a/modules/parsers/nasm/nasm-std.mac b/modules/parsers/nasm/nasm-std.mac
index 3c9223abe29d9bffd6ef04ef9c60103ba924f129..bb6e5c4e839998c3bdf908e97085c8595020cf3d 100644 (file)
--- a/modules/parsers/nasm/nasm-std.mac
+++ b/modules/parsers/nasm/nasm-std.mac
@@ -25,14 +25,14 @@
          __SECT__
 %endmacro
 
-%imacro struc 1.nolist
+%imacro struc 1-2.nolist 0
 %push struc
 %define %$strucname %1
-[absolute 0]
+[absolute %2]
 %$strucname:                   ; allow definition of `.member' to work sanely
 %endmacro 
 %imacro endstruc 0.nolist
-%{$strucname}_size:
+%{$strucname}_size EQU $ - %$strucname
 %pop
 __SECT__
 %endmacro