Patchwork [12/16] target-pcc: Convert ppcemb_tlb_t to use fixed 64-bit RPN

mail settings
Submitter David Gibson
Date Oct. 30, 2012, 3:25 a.m.
Message ID <>
Download mbox | patch
Permalink /patch/195280/
State New
Headers show


David Gibson - Oct. 30, 2012, 3:25 a.m.
Currently the ppcemb_tlb_t struct, used on a number of embedded ppc models
to represent a TLB entry contains a hwaddr.  That works reasonably for now,
but is troublesome for saving the state, which we'll want to do in future.
hwaddr is a large enough type to contain a physical address for any
supported machine - and can thus, in theory at least, vary depending on
what machines are enabled other than the one we're actually using right
now (though in fact it doesn't for ppc).  This makes it unsuitable for
describing in vmstate.

This patch therefore changes ppcemb_tlb_t to use a fixed 64-bit integer
which we know is sufficient for all the machines which use this structure.

Signed-off-by: David Gibson <>
 target-ppc/cpu.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 380a8d2..51f4dd9 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -355,7 +355,7 @@  struct ppc6xx_tlb_t {
 typedef struct ppcemb_tlb_t ppcemb_tlb_t;
 struct ppcemb_tlb_t {
-    hwaddr RPN;
+    uint64_t RPN;
     target_ulong EPN;
     target_ulong PID;
     target_ulong size;