ppc: suppressed unneeded globals and headers - added explicit type for ppc nvram

[qemu] / cpu-defs.h

diff --git a/cpu-defs.h b/cpu-defs.h
index 3ec866f..bbdb390 100644 (file)
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -22,6 +22,32 @@
 
 #include "config.h"
 #include <setjmp.h>
+#include <inttypes.h>
+#include "osdep.h"
+
+#ifndef TARGET_LONG_BITS
+#error TARGET_LONG_BITS must be defined before including this header
+#endif
+
+#define TARGET_LONG_SIZE (TARGET_LONG_BITS / 8)
+
+#if TARGET_LONG_SIZE == 4
+typedef int32_t target_long;
+typedef uint32_t target_ulong;
+#elif TARGET_LONG_SIZE == 8
+typedef int64_t target_long;
+typedef uint64_t target_ulong;
+#else
+#error TARGET_LONG_SIZE undefined
+#endif
+
+#if defined(__alpha__) || defined (__ia64__) || defined(__x86_64__)
+#define HOST_LONG_BITS 64
+#else
+#define HOST_LONG_BITS 32
+#endif
+
+#define HOST_LONG_SIZE (HOST_LONG_BITS / 8)
 
 #define EXCP_INTERRUPT         256 /* async interruption */
 #define EXCP_HLT        257 /* hlt instruction reached */
@@ -32,8 +58,15 @@
 #define CPU_TLB_SIZE 256
 
 typedef struct CPUTLBEntry {
-    uint32_t address;
-    uint32_t addend;
+    /* bit 31 to TARGET_PAGE_BITS : virtual address 
+       bit TARGET_PAGE_BITS-1..IO_MEM_SHIFT : if non zero, memory io
+                                              zone number
+       bit 3                      : indicates that the entry is invalid
+       bit 2..0                   : zero
+    */
+    uint32_t address; 
+    /* addend to virtual address to get physical address */
+    uint32_t addend; 
 } CPUTLBEntry;
 
 #endif