7 files changed, 14 insertions, 14 deletions
diff --git a/src/arch/i386/drivers/net/undinet.c b/src/arch/i386/drivers/net/undinet.c
index a5746ce8d..07bec560b 100644
--- a/src/arch/i386/drivers/net/undinet.c
+++ b/src/arch/i386/drivers/net/undinet.c
@@ -217,7 +217,7 @@ static int undinet_call ( struct undi_nic *undinic, unsigned int function,
 		DBGC ( undinic, "UNDINIC %p %s failed: %s\n", undinic,
 		       undinet_function_name ( function ), strerror ( rc ) );
 		DBGC ( undinic, "UNDINIC %p parameters at %04x:%04x length "
-		       "%#02x, entry point at %04x:%04x\n", undinic,
+		       "%#02zx, entry point at %04x:%04x\n", undinic,
 		       rm_params.segment, rm_params.offset, params_len,
 		       undinet_entry_point.segment,
 		       undinet_entry_point.offset );
diff --git a/src/arch/i386/drivers/net/undirom.c b/src/arch/i386/drivers/net/undirom.c
index 45bcf9694..f977a5532 100644
--- a/src/arch/i386/drivers/net/undirom.c
+++ b/src/arch/i386/drivers/net/undirom.c
@@ -70,7 +70,7 @@ static int undirom_parse_pxeromid ( struct undi_rom *undirom,
 	undirom->data_size = undi_rom_id.DataSize;
 
 	DBGC ( undirom, "UNDIROM %p has UNDI loader at %04x:%04x "
-	       "(code %04x data %04x)\n", undirom,
+	       "(code %04zx data %04zx)\n", undirom,
 	       undirom->loader_entry.segment, undirom->loader_entry.offset,
 	       undirom->code_size, undirom->data_size );
 	return 0;
diff --git a/src/arch/i386/firmware/pcbios/smbios.c b/src/arch/i386/firmware/pcbios/smbios.c
index d8be6f8b1..4d710d689 100644
--- a/src/arch/i386/firmware/pcbios/smbios.c
+++ b/src/arch/i386/firmware/pcbios/smbios.c
@@ -220,7 +220,7 @@ int find_smbios_structure ( unsigned int type, void *structure,
 		strings_offset = ( offset + header.length );
 		if ( strings_offset > smbios->length ) {
 			DBG ( "SMBIOS structure at offset %zx with length "
-			      "%zx extends beyond SMBIOS\n", offset,
+			      "%x extends beyond SMBIOS\n", offset,
 			      header.length );
 			return -ENOENT;
 		}
@@ -236,7 +236,7 @@ int find_smbios_structure ( unsigned int type, void *structure,
 		strings->length = ( terminator_offset - strings_offset );
 
 		DBG ( "SMBIOS structure at offset %zx has type %d, "
-		      "length %zx, strings length %zx\n",
+		      "length %x, strings length %zx\n",
 		      offset, header.type, header.length, strings->length );
 
 		/* If this is the structure we want, return */
diff --git a/src/arch/i386/image/bzimage.c b/src/arch/i386/image/bzimage.c
index f05916819..ed9d286d2 100644
--- a/src/arch/i386/image/bzimage.c
+++ b/src/arch/i386/image/bzimage.c
@@ -344,7 +344,7 @@ static int bzimage_exec ( struct image *image ) {
 	shutdown();
 
 	DBGC ( image, "bzImage %p jumping to RM kernel at %04x:0000 "
-	       "(stack %04x:%04x)\n", image,
+	       "(stack %04x:%04zx)\n", image,
 	       ( exec_ctx.rm_kernel_seg + 0x20 ),
 	       exec_ctx.rm_kernel_seg, exec_ctx.rm_heap );
 
diff --git a/src/arch/i386/image/nbi.c b/src/arch/i386/image/nbi.c
index a1d74553d..195cfbf7a 100644
--- a/src/arch/i386/image/nbi.c
+++ b/src/arch/i386/image/nbi.c
@@ -233,7 +233,7 @@ static int nbi_process_segments ( struct image *image,
 	} while ( ! NBI_LAST_SEGHEADER ( sh.flags ) );
 
 	if ( offset != image->len ) {
-		DBGC ( image, "NBI %p length wrong (file %d, metadata %d)\n",
+		DBGC ( image, "NBI %p length wrong (file %zd, metadata %zd)\n",
 		       image, image->len, offset );
 		return -ENOEXEC;
 	}
diff --git a/src/arch/i386/prefix/unnrv2b.S b/src/arch/i386/prefix/unnrv2b.S
index 3209fb292..70167a14a 100644
--- a/src/arch/i386/prefix/unnrv2b.S
+++ b/src/arch/i386/prefix/unnrv2b.S
@@ -54,7 +54,6 @@
  * NOTE: It would be possible to build a smaller version of the
  * decompression code for -DKEEP_IT_REAL by using
  *    #define REG(x) x
- *    #define MOVSB movsb
  * to use 16-bit registers where possible.  This would impose limits
  * that the compressed data size must be in the range [1,65533-%si]
  * and the uncompressed data size must be in the range [1,65536-%di]
@@ -67,7 +66,7 @@
  */
 
 #define REG(x) e ## x
-#define MOVSB addr32 movsb
+#define ADDR32 addr32
 
 	.code16
 	.globl	decompress16
@@ -89,6 +88,7 @@ decompress16:
  */
 
 #define REG(x) e ## x
+#define ADDR32
 	
 	.code32
 	.globl	decompress
@@ -114,7 +114,7 @@ decompress:
 	jmp	dcl1_n2b
 	
 decompr_literals_n2b:
-	MOVSB
+	ADDR32 movsb
 decompr_loop_n2b:
 	addl	%ebx, %ebx
 	jnz	dcl2_n2b
@@ -132,7 +132,7 @@ loop1_n2b:
 	sub	$3, %xAX
 	jb	decompr_ebpeax_n2b	/* if (m_off == 2) goto decompr_ebpeax_n2b ? */
 	shl	$8, %xAX	
-	movb	(%xSI), %al	/* m_off = (m_off - 3)*256 + src[ilen++] */
+	ADDR32 movb (%xSI), %al	/* m_off = (m_off - 3)*256 + src[ilen++] */
 	inc	%xSI
 	xor	$-1, %xAX
 	jz	decompr_end_n2b	/* if (m_off == 0xffffffff) goto decomp_end_n2b */
@@ -156,9 +156,9 @@ decompr_got_mlen_n2b:
 	cmp	$-0xd00, %xBP
 	adc	$1, %xCX	/* m_len = m_len + 1 + (last_m_off > 0xd00) */
 	push	%xSI
-	lea	(%xBP,%xDI), %xSI	/* m_pos = dst + olen + -m_off  */
+	ADDR32 lea (%xBP,%xDI), %xSI	/* m_pos = dst + olen + -m_off  */
 	rep
-	es MOVSB		/* dst[olen++] = *m_pos++ while(m_len > 0) */
+	es ADDR32 movsb		/* dst[olen++] = *m_pos++ while(m_len > 0) */
 	pop	%xSI
 	jmp	decompr_loop_n2b
 
@@ -167,7 +167,7 @@ getbit1:
 	addl	%ebx, %ebx
 	jnz	1f
 getbit32:
-	movl	(%xSI), %ebx
+	ADDR32 movl (%xSI), %ebx
 	sub	$-4, %xSI	/* sets carry flag */
 	adcl	%ebx, %ebx
 1:
diff --git a/src/arch/i386/transitions/librm.S b/src/arch/i386/transitions/librm.S
index fbf3b2ac5..b1f9dd594 100644
--- a/src/arch/i386/transitions/librm.S
+++ b/src/arch/i386/transitions/librm.S
@@ -192,7 +192,7 @@ real_to_prot:
 	movzwl	%sp, %edx
 	movl	%ebp, %eax
 	shll	$4, %eax
-	leal	(%eax,%edx), %esi
+	addr32 leal (%eax,%edx), %esi
 	subl	_virt_offset, %esi
 
 	/* Switch to protected mode */