Index: trunk/i386/libsaio/bios.s
===================================================================
--- trunk/i386/libsaio/bios.s	(revision 2422)
+++ trunk/i386/libsaio/bios.s	(revision 2423)
@@ -80,21 +80,21 @@
     bits of code and data within the first 63.5k and modify the loaders to
     be able to load more than 63.5k.
  */
-    .align 2
+    .align 4
 save_eax:   .space 4
+    .align 4
+save_edx:   .space 4
     .align 2
-save_edx:   .space 4
-    .align 1
 save_es:    .space 2
-    .align 1
+    .align 2
 save_flag:  .space 2
-    .align 2
+    .align 4
 new_eax:    .space 4
+    .align 4
+new_edx:    .space 4
     .align 2
-new_edx:    .space 4
-    .align 1
 new_es:     .space 2
-    .align 1
+    .align 2
 new_ds:     .space 2
 
     .section __INIT,__text      // turbo - This code must reside within the first segment
Index: trunk/i386/include/architecture/i386/asm_help.h
===================================================================
--- trunk/i386/include/architecture/i386/asm_help.h	(revision 2422)
+++ trunk/i386/include/architecture/i386/asm_help.h	(revision 2423)
@@ -45,7 +45,7 @@
 #ifdef	__ASSEMBLER__
 
 #define ALIGN						\
-	.align	2, 0x90
+	.align	4, 0x90
 
 #define	ROUND_TO_STACK(len)				\
 	(((len) + STACK_INCR - 1) / STACK_INCR * STACK_INCR)
Index: trunk/i386/include/mach/i386/asm.h
===================================================================
--- trunk/i386/include/mach/i386/asm.h	(revision 2422)
+++ trunk/i386/include/mach/i386/asm.h	(revision 2423)
@@ -107,7 +107,7 @@
 
 /* There is another definition of ALIGN for .c sources */
 #ifdef ASSEMBLER
-#define ALIGN 4,0x90
+#define ALIGN 16,0x90
 #endif /* ASSEMBLER */
 
 #ifndef FALIGN
Index: trunk/i386/boot2/drivers.c
===================================================================
--- trunk/i386/boot2/drivers.c	(revision 2422)
+++ trunk/i386/boot2/drivers.c	(revision 2423)
@@ -530,6 +530,12 @@
 		break;
 	}
 
+	if (!module) // cparm
+	{
+		ret = -1;
+		break;
+	} // Should never happen but it will make the compiler happy
+
 	// Allocate memory for the driver path and the plist.
 
 	module->executablePath = tmpExecutablePath;
@@ -904,7 +910,8 @@
 		}
 		// MinusZwei
 
-		if (uncompressed_size != size) {
+		if (uncompressed_size != size)
+		{
 			error("ERROR: size mismatch from lzss (found: %x, expected: %x).\n", size, uncompressed_size);
 			return -1;
 		}
Index: trunk/i386/boot2/boot.c
===================================================================
--- trunk/i386/boot2/boot.c	(revision 2422)
+++ trunk/i386/boot2/boot.c	(revision 2423)
@@ -718,7 +718,8 @@
 			printf("Can't find %s\n", bootFile);
 			sleep(1);
 
-			if (gBootFileType == kNetworkDeviceType) {
+			if (gBootFileType == kNetworkDeviceType)
+			{
 				// Return control back to PXE. Don't unload PXE base code.
 				gUnloadPXEOnExit = false;
 				break;
Index: trunk/i386/boot2/boot2.s
===================================================================
--- trunk/i386/boot2/boot2.s	(revision 2422)
+++ trunk/i386/boot2/boot2.s	(revision 2423)
@@ -153,7 +153,7 @@
 # cannot do that and have GRUB find it because GRUB only searches the first
 # 8k of the binary.  Since __TEXT,__const follows __TEXT,__text (the code
 # section) and since the code is well over 8k long, it doesn't work.
-.align 2, 0x90 # Make sure we're on a 4-byte boundary.  Required by Multiboot.
+.align 4, 0x90 # Make sure we're on a 4-byte boundary.  Required by Multiboot.
 _multiboot_header:
     # magic (NOTE: this shows up as 02b0 ad1b in a hex dump)
     .long   MULTIBOOT_HEADER_MAGIC
@@ -176,7 +176,7 @@
     nop
     nop
     nop
-.align 3, 0x90 # Align to 8 byte boundary which should be enough nops
+.align 8, 0x90 # Align to 8 byte boundary which should be enough nops
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 _multiboot_entry:
@@ -276,7 +276,7 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # _continue_at_low_address does some trickery to get the caller running from the low address with the right selector
     .globl _continue_at_low_address
-    .align 2, 0x90
+    .align 4, 0x90
 _continue_at_low_address:
     # Our stack frame has been set up with the return address on top
     # First, fix that to be 1 MB lower
@@ -325,7 +325,7 @@
 # We aren't using it right now so it's in an if 0 block.
 #if 0
     .globl _cause_crash
-    .align 2, 0x90
+    .align 4, 0x90
 _cause_crash:
     # Cause a crash, there is no GDT selector f0
     jmp     $0xf0,$0
@@ -338,7 +338,7 @@
 # See the comments above as to why we have OFFSET_1MEG.
     //.data
     .section __INIT,__data	// turbo
-    .align 2, 0x90
+    .align 4, 0x90
 _Gdtr_high:
     .word GDTLIMIT
     .long vtop(_Gdt + OFFSET_1MEG)
Index: trunk/i386/boot2/boot.h
===================================================================
--- trunk/i386/boot2/boot.h	(revision 2422)
+++ trunk/i386/boot2/boot.h	(revision 2423)
@@ -88,7 +88,7 @@
 #define kHidePartition		"Hide Partition"	/* disk.c */
 #define kRenamePartition	"Rename Partition"	/* disk.c */
 #define kSMBIOSKey		"SMBIOS"		/* fake_efi.c */
-#define kSystemID		"SystemId"		/* fake_efi.c */
+//#define kSystemID		"SystemId"		/* fake_efi.c */
 #define kSystemType		"SystemType"		/* fake_efi.c */
 #define kUseNvidiaROM		"UseNvidiaROM"		/* nvidia.c */
 #define kVBIOS			"VBIOS"			/* nvidia.c && ati.c */
Index: trunk/CHANGES
===================================================================
--- trunk/CHANGES	(revision 2422)
+++ trunk/CHANGES	(revision 2423)
@@ -1,3 +1,4 @@
+- meklort : Update align directives to 2^(old_align)
 - Ermac : Bump svn to 2.3
 - ErmaC : Update efi Header
 - cparm : buffer BPS