projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cscope rule
[qemu]
/
cpu-defs.h
diff --git
a/cpu-defs.h
b/cpu-defs.h
index
2e643e6
..
83d1748
100644
(file)
--- a/
cpu-defs.h
+++ b/
cpu-defs.h
@@
-30,7
+30,11
@@
#endif
#ifndef TARGET_PHYS_ADDR_BITS
#endif
#ifndef TARGET_PHYS_ADDR_BITS
+#if TARGET_LONG_BITS >= HOST_LONG_BITS
#define TARGET_PHYS_ADDR_BITS TARGET_LONG_BITS
#define TARGET_PHYS_ADDR_BITS TARGET_LONG_BITS
+#else
+#define TARGET_PHYS_ADDR_BITS HOST_LONG_BITS
+#endif
#endif
#define TARGET_LONG_SIZE (TARGET_LONG_BITS / 8)
#endif
#define TARGET_LONG_SIZE (TARGET_LONG_BITS / 8)
@@
-39,15
+43,21
@@
#if TARGET_LONG_SIZE == 4
typedef int32_t target_long;
typedef uint32_t target_ulong;
#if TARGET_LONG_SIZE == 4
typedef int32_t target_long;
typedef uint32_t target_ulong;
+#define TARGET_FMT_lx "%08x"
#elif TARGET_LONG_SIZE == 8
typedef int64_t target_long;
typedef uint64_t target_ulong;
#elif TARGET_LONG_SIZE == 8
typedef int64_t target_long;
typedef uint64_t target_ulong;
+#define TARGET_FMT_lx "%016llx"
#else
#error TARGET_LONG_SIZE undefined
#endif
/* target_phys_addr_t is the type of a physical address (its size can
#else
#error TARGET_LONG_SIZE undefined
#endif
/* target_phys_addr_t is the type of a physical address (its size can
- be different from 'target_ulong') */
+ be different from 'target_ulong'). We have sizeof(target_phys_addr)
+ = max(sizeof(unsigned long),
+ sizeof(size_of_target_physical_address)) because we must pass a
+ host pointer to memory operations in some cases */
+
#if TARGET_PHYS_ADDR_BITS == 32
typedef uint32_t target_phys_addr_t;
#elif TARGET_PHYS_ADDR_BITS == 64
#if TARGET_PHYS_ADDR_BITS == 32
typedef uint32_t target_phys_addr_t;
#elif TARGET_PHYS_ADDR_BITS == 64
@@
-56,17
+66,11
@@
typedef uint64_t target_phys_addr_t;
#error TARGET_PHYS_ADDR_BITS undefined
#endif
#error TARGET_PHYS_ADDR_BITS 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 HOST_LONG_SIZE (HOST_LONG_BITS / 8)
-#define EXCP_INTERRUPT 256 /* async interruption */
-#define EXCP_HLT 257 /* hlt instruction reached */
-#define EXCP_DEBUG 258 /* cpu stopped after a breakpoint or singlestep */
+#define EXCP_INTERRUPT 0x10000 /* async interruption */
+#define EXCP_HLT 0x10001 /* hlt instruction reached */
+#define EXCP_DEBUG 0x10002 /* cpu stopped after a breakpoint or singlestep */
#define MAX_BREAKPOINTS 32
#define MAX_BREAKPOINTS 32
@@
-79,9
+83,9
@@
typedef struct CPUTLBEntry {
bit 3 : indicates that the entry is invalid
bit 2..0 : zero
*/
bit 3 : indicates that the entry is invalid
bit 2..0 : zero
*/
- uint32_t address;
+ target_ulong address;
/* addend to virtual address to get physical address */
/* addend to virtual address to get physical address */
- uint32_t addend;
+ target_phys_addr_t addend;
} CPUTLBEntry;
#endif
} CPUTLBEntry;
#endif