--- trunk/mkinitrd-magellan/isolinux/macros.inc	2010/08/19 08:27:19	1132
+++ trunk/mkinitrd-magellan/isolinux/macros.inc	2010/08/19 09:50:43	1133
@@ -1,7 +1,7 @@
-;; $Id: macros.inc,v 1.1 2007-09-01 22:44:05 niro Exp $
 ;; -----------------------------------------------------------------------
-;;   
-;;   Copyright 1994-2004 H. Peter Anvin - All Rights Reserved
+;;
+;;   Copyright 1994-2008 H. Peter Anvin - All Rights Reserved
+;;   Copyright 2009 Intel Corporation; author: H. Peter Anvin
 ;;
 ;;   This program is free software; you can redistribute it and/or modify
 ;;   it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
 
 ;;
 ;; macros.inc
-;; 
+;;
 ;; Convenient macros
 ;;
 
@@ -24,20 +24,25 @@
 ; Identify the module we're compiling; the "correct" should be defined
 ; in the module itself to 1
 ;
-%ifndef IS_SYSLINUX
-%define IS_SYSLINUX 0
-%endif
-%ifndef IS_MDSLINUX
-%define IS_MDSLINUX 0
-%endif
-%ifndef IS_PXELINUX
-%define IS_PXELINUX 0
-%endif
-%ifndef IS_ISOLINUX
-%define IS_ISOLINUX 0
-%endif
-%ifndef IS_EXTLINUX
-%define IS_EXTLINUX 0
+%ifdef IS_SYSLINUX
+ %define MY_NAME 'SYSLINUX'
+%else
+ %define IS_SYSLINUX 0
+%endif
+%ifdef IS_PXELINUX
+ %define MY_NAME 'PXELINUX'
+%else
+ %define IS_PXELINUX 0
+%endif
+%ifdef IS_ISOLINUX
+ %define MY_NAME 'ISOLINUX'
+%else
+ %define IS_ISOLINUX 0
+%endif
+%ifdef IS_EXTLINUX
+ %define MY_NAME 'EXTLINUX'
+%else
+ %define IS_EXTLINUX 0
 %endif
 
 ;
@@ -57,39 +62,39 @@
 %endmacro
 
 ;
+; Align with zero bytes in a progbits segment
+;
+%macro	alignz	1.nolist
+	times (((%1) - (($-$$) % (%1))) % (%1)) db 0
+%endmacro
+
+;
 ; Macro to emit an unsigned decimal number as a string
 ;
 %macro asciidec	1.nolist
-%ifndef DEPEND	; Not safe for "depend"
-%if %1 >= 1000000000
-	db ((%1/1000000000) % 10) + '0'
-%endif
-%if %1 >= 100000000
-	db ((%1/100000000) % 10) + '0'
-%endif
-%if %1 >= 10000000
-	db ((%1/10000000) % 10) + '0'
-%endif
-%if %1 >= 1000000
-	db ((%1/1000000) % 10) + '0'
-%endif
-%if %1 >= 100000
-	db ((%1/100000) % 10) + '0'
-%endif
-%if %1 >= 10000
-	db ((%1/10000) % 10) + '0'
-%endif
-%if %1 >= 1000
-	db ((%1/1000) % 10) + '0'
-%endif
-%if %1 >= 100
-	db ((%1/100) % 10) + '0'
-%endif
-%if %1 >= 10
-	db ((%1/10) % 10) + '0'
-%endif
-	db (%1 % 10) + '0'
-%endif
+  %ifndef DEPEND	; Not safe for "depend"
+    %push asciidec
+      %assign %$v %1
+      %if %$v == 0
+        db '0'
+      %else
+        %assign %$dcount 0
+        %assign %$n %$v
+        %assign %$d 1
+        %rep 20
+          %if %$n != 0
+            %assign %$dcount %$dcount + 1
+            %assign %$n %$n / 10
+            %assign %$d %$d * 10
+          %endif
+        %endrep
+        %rep %$dcount
+	  %assign %$d %$d / 10
+          db ((%$v / %$d) % 10) + '0'
+        %endrep
+      %endif
+    %pop
+  %endif
 %endmacro
 
 ;