Bläddra i källkod

[bios] Use size_t when casting _text16_memsz and _data16_memsz

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 9 år sedan
förälder
incheckning
9f79f5f1a5
2 ändrade filer med 7 tillägg och 6 borttagningar
  1. 2
    2
      src/arch/i386/firmware/pcbios/hidemem.c
  2. 5
    4
      src/arch/i386/interface/pxe/pxe_call.c

+ 2
- 2
src/arch/i386/firmware/pcbios/hidemem.c Visa fil

@@ -76,9 +76,9 @@ extern struct segoff __text16 ( int15_vector );
76 76
 extern char _textdata[];
77 77
 extern char _etextdata[];
78 78
 extern char _text16_memsz[];
79
-#define _text16_memsz ( ( unsigned int ) _text16_memsz )
79
+#define _text16_memsz ( ( size_t ) _text16_memsz )
80 80
 extern char _data16_memsz[];
81
-#define _data16_memsz ( ( unsigned int ) _data16_memsz )
81
+#define _data16_memsz ( ( size_t ) _data16_memsz )
82 82
 
83 83
 /**
84 84
  * Hide region of memory from system memory map

+ 5
- 4
src/arch/i386/interface/pxe/pxe_call.c Visa fil

@@ -56,9 +56,11 @@ static int int_1a_hooked = 0;
56 56
 
57 57
 /** Real-mode code segment size */
58 58
 extern char _text16_memsz[];
59
+#define _text16_memsz ( ( size_t ) _text16_memsz )
59 60
 
60 61
 /** Real-mode data segment size */
61 62
 extern char _data16_memsz[];
63
+#define _data16_memsz ( ( size_t ) _data16_memsz )
62 64
 
63 65
 /** PXENV_UNDI_TRANSMIT API call profiler */
64 66
 static struct profiler pxe_api_tx_profiler __profiler =
@@ -337,10 +339,9 @@ int pxe_start_nbp ( void ) {
337 339
 	int discard_b, discard_c, discard_d, discard_D;
338 340
 	uint16_t status;
339 341
 
340
-	DBGC ( &pxe_netdev, "PXE NBP starting with netdev %s, code %04x:%04x, "
341
-	       "data %04x:%04x\n", ( pxe_netdev ? pxe_netdev->name : "<none>" ),
342
-	       rm_cs, ( ( unsigned int ) _text16_memsz ),
343
-	       rm_ds, ( ( unsigned int ) _data16_memsz ) );
342
+	DBGC ( &pxe_netdev, "PXE NBP starting with netdev %s, code %04x:%04zx, "
343
+	       "data %04x:%04zx\n", ( pxe_netdev ? pxe_netdev->name : "<none>"),
344
+	       rm_cs, _text16_memsz, rm_ds, _data16_memsz );
344 345
 
345 346
 	/* Allow restarting NBP via PXENV_RESTART_TFTP */
346 347
 	jmp = rmsetjmp ( pxe_restart_nbp );

Laddar…
Avbryt
Spara