diff options
| author | Paul Brook <paul@codesourcery.com> | 2010-04-05 00:28:53 +0100 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2010-04-05 00:28:53 +0100 |
| commit | 355b194369d02df7a97d554eef2a9cffe98d736f (patch) | |
| tree | 15fb62cc03f22548ea08f7cb1609d7abe7970052 /tcg/ppc64/tcg-target.c | |
| parent | 5bd2c0d7a6778542827ac7f897eed3fb5cf7ff5a (diff) | |
| download | qemu-355b194369d02df7a97d554eef2a9cffe98d736f.tar.gz qemu-355b194369d02df7a97d554eef2a9cffe98d736f.tar.bz2 qemu-355b194369d02df7a97d554eef2a9cffe98d736f.zip | |
Split TLB addend and target_phys_addr_t
Historically the qemu tlb "addend" field was used for both RAM and IO accesses,
so needed to be able to hold both host addresses (unsigned long) and guest
physical addresses (target_phys_addr_t). However since the introduction of
the iotlb field it has only been used for RAM accesses.
This means we can change the type of addend to unsigned long, and remove
associated hacks in the big-endian TCG backends.
We can also remove the host dependence from target_phys_addr_t.
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'tcg/ppc64/tcg-target.c')
| -rw-r--r-- | tcg/ppc64/tcg-target.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index 4d6e68c306..2725c6e165 100644 --- a/tcg/ppc64/tcg-target.c +++ b/tcg/ppc64/tcg-target.c @@ -28,14 +28,6 @@ static uint8_t *tb_ret_addr; #define FAST_PATH -#ifdef CONFIG_SOFTMMU -#if TARGET_PHYS_ADDR_BITS == 32 -#define LD_ADDEND LWZ -#else -#define LD_ADDEND LD -#endif -#endif - #if TARGET_LONG_BITS == 32 #define LD_ADDR LWZU #define CMP_L 0 @@ -684,7 +676,7 @@ static void tcg_out_qemu_ld (TCGContext *s, const TCGArg *args, int opc) #endif /* r0 now contains &env->tlb_table[mem_index][index].addr_read */ - tcg_out32 (s, (LD_ADDEND + tcg_out32 (s, (LD | RT (r0) | RA (r0) | (offsetof (CPUTLBEntry, addend) @@ -812,7 +804,7 @@ static void tcg_out_qemu_st (TCGContext *s, const TCGArg *args, int opc) reloc_pc14 (label1_ptr, (tcg_target_long) s->code_ptr); #endif - tcg_out32 (s, (LD_ADDEND + tcg_out32 (s, (LD | RT (r0) | RA (r0) | (offsetof (CPUTLBEntry, addend) |