Revert "Get rid of _t suffix"

In the very least, a change like this requires discussion on the list.

The naming convention is goofy and it causes a massive merge problem.  Something
like this _must_ be presented on the list first so people can provide input
and cope with it.

This reverts commit 99a0949b720a0936da2052cb9a46db04ffc6db29.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

3 files changed, 37 insertions, 37 deletions

diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h
index e99c9b0..63aead9 100644
--- a/target-sparc/cpu.h
+++ b/target-sparc/cpu.h
@@ -520,7 +520,7 @@ static inline void PUT_CWP64(CPUSPARCState *env1, int cwp)
 #endif
 
 /* cpu-exec.c */
-void do_unassigned_access(a_target_phys_addr addr, int is_write, int is_exec,
+void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
                           int is_asi, int size);
 int cpu_sparc_signal_handler(int host_signum, void *pinfo, void *puc);
 
diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index 7d4811b..920432c 100644
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -36,7 +36,7 @@ static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, const char *cpu_model);
 
 /* thread support */
 
-static a_spinlock global_cpu_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t global_cpu_lock = SPIN_LOCK_UNLOCKED;
 
 void cpu_lock(void)
 {
@@ -100,12 +100,12 @@ static const int perm_table[2][8] = {
     }
 };
 
-static int get_physical_address(CPUState *env, a_target_phys_addr *physical,
+static int get_physical_address(CPUState *env, target_phys_addr_t *physical,
                                 int *prot, int *access_index,
                                 target_ulong address, int rw, int mmu_idx)
 {
     int access_perms = 0;
-    a_target_phys_addr pde_ptr;
+    target_phys_addr_t pde_ptr;
     uint32_t pde;
     target_ulong virt_addr;
     int error_code = 0, is_dirty, is_user;
@@ -214,7 +214,7 @@ static int get_physical_address(CPUState *env, a_target_phys_addr *physical,
 
     /* Even if large ptes, we map only one 4KB page in the cache to
        avoid filling it too fast */
-    *physical = ((a_target_phys_addr)(pde & PTE_ADDR_MASK) << 4) + page_offset;
+    *physical = ((target_phys_addr_t)(pde & PTE_ADDR_MASK) << 4) + page_offset;
     return error_code;
 }
 
@@ -222,7 +222,7 @@ static int get_physical_address(CPUState *env, a_target_phys_addr *physical,
 int cpu_sparc_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
                               int mmu_idx, int is_softmmu)
 {
-    a_target_phys_addr paddr;
+    target_phys_addr_t paddr;
     target_ulong vaddr;
     int error_code = 0, prot, ret = 0, access_index;
 
@@ -264,11 +264,11 @@ int cpu_sparc_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
 
 target_ulong mmu_probe(CPUState *env, target_ulong address, int mmulev)
 {
-    a_target_phys_addr pde_ptr;
+    target_phys_addr_t pde_ptr;
     uint32_t pde;
 
     /* Context base + context number */
-    pde_ptr = (a_target_phys_addr)(env->mmuregs[1] << 4) +
+    pde_ptr = (target_phys_addr_t)(env->mmuregs[1] << 4) +
         (env->mmuregs[2] << 2);
     pde = ldl_phys(pde_ptr);
 
@@ -330,14 +330,14 @@ void dump_mmu(CPUState *env)
 {
     target_ulong va, va1, va2;
     unsigned int n, m, o;
-    a_target_phys_addr pde_ptr, pa;
+    target_phys_addr_t pde_ptr, pa;
     uint32_t pde;
 
     printf("MMU dump:\n");
     pde_ptr = (env->mmuregs[1] << 4) + (env->mmuregs[2] << 2);
     pde = ldl_phys(pde_ptr);
     printf("Root ptr: " TARGET_FMT_plx ", ctx: %d\n",
-           (a_target_phys_addr)env->mmuregs[1] << 4, env->mmuregs[2]);
+           (target_phys_addr_t)env->mmuregs[1] << 4, env->mmuregs[2]);
     for (n = 0, va = 0; n < 256; n++, va += 16 * 1024 * 1024) {
         pde = mmu_probe(env, va, 2);
         if (pde) {
@@ -370,7 +370,7 @@ void dump_mmu(CPUState *env)
 #else /* !TARGET_SPARC64 */
 
 // 41 bit physical address space
-static inline a_target_phys_addr ultrasparc_truncate_physical(uint64_t x)
+static inline target_phys_addr_t ultrasparc_truncate_physical(uint64_t x)
 {
     return x & 0x1ffffffffffULL;
 }
@@ -388,7 +388,7 @@ static inline int compare_masked(uint64_t x, uint64_t y, uint64_t mask)
 // requires virtual address mask value calculated from TTE entry size
 static inline int ultrasparc_tag_match(SparcTLBEntry *tlb,
                                        uint64_t address, uint64_t context,
-                                       a_target_phys_addr *physical)
+                                       target_phys_addr_t *physical)
 {
     uint64_t mask;
 
@@ -422,7 +422,7 @@ static inline int ultrasparc_tag_match(SparcTLBEntry *tlb,
 }
 
 static int get_physical_address_data(CPUState *env,
-                                     a_target_phys_addr *physical, int *prot,
+                                     target_phys_addr_t *physical, int *prot,
                                      target_ulong address, int rw, int is_user)
 {
     unsigned int i;
@@ -481,7 +481,7 @@ static int get_physical_address_data(CPUState *env,
 }
 
 static int get_physical_address_code(CPUState *env,
-                                     a_target_phys_addr *physical, int *prot,
+                                     target_phys_addr_t *physical, int *prot,
                                      target_ulong address, int is_user)
 {
     unsigned int i;
@@ -527,7 +527,7 @@ static int get_physical_address_code(CPUState *env,
     return 1;
 }
 
-static int get_physical_address(CPUState *env, a_target_phys_addr *physical,
+static int get_physical_address(CPUState *env, target_phys_addr_t *physical,
                                 int *prot, int *access_index,
                                 target_ulong address, int rw, int mmu_idx)
 {
@@ -546,7 +546,7 @@ int cpu_sparc_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
                               int mmu_idx, int is_softmmu)
 {
     target_ulong virt_addr, vaddr;
-    a_target_phys_addr paddr;
+    target_phys_addr_t paddr;
     int error_code = 0, prot, ret = 0, access_index;
 
     error_code = get_physical_address(env, &paddr, &prot, &access_index,
@@ -649,15 +649,15 @@ void dump_mmu(CPUState *env)
 
 
 #if defined(CONFIG_USER_ONLY)
-a_target_phys_addr cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
+target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
 {
     return addr;
 }
 
 #else
-a_target_phys_addr cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
+target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
 {
-    a_target_phys_addr phys_addr;
+    target_phys_addr_t phys_addr;
     int prot, access_index;
 
     if (get_physical_address(env, &phys_addr, &prot, &access_index, addr, 2,
diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c
index 4a801ed..8992d1c 100644
--- a/target-sparc/op_helper.c
+++ b/target-sparc/op_helper.c
@@ -1514,21 +1514,21 @@ uint64_t helper_ld_asi(target_ulong addr, int asi, int size, int sign)
     case 0x21 ... 0x2f: /* MMU passthrough, 0x100000000 to 0xfffffffff */
         switch(size) {
         case 1:
-            ret = ldub_phys((a_target_phys_addr)addr
-                            | ((a_target_phys_addr)(asi & 0xf) << 32));
+            ret = ldub_phys((target_phys_addr_t)addr
+                            | ((target_phys_addr_t)(asi & 0xf) << 32));
             break;
         case 2:
-            ret = lduw_phys((a_target_phys_addr)addr
-                            | ((a_target_phys_addr)(asi & 0xf) << 32));
+            ret = lduw_phys((target_phys_addr_t)addr
+                            | ((target_phys_addr_t)(asi & 0xf) << 32));
             break;
         default:
         case 4:
-            ret = ldl_phys((a_target_phys_addr)addr
-                           | ((a_target_phys_addr)(asi & 0xf) << 32));
+            ret = ldl_phys((target_phys_addr_t)addr
+                           | ((target_phys_addr_t)(asi & 0xf) << 32));
             break;
         case 8:
-            ret = ldq_phys((a_target_phys_addr)addr
-                           | ((a_target_phys_addr)(asi & 0xf) << 32));
+            ret = ldq_phys((target_phys_addr_t)addr
+                           | ((target_phys_addr_t)(asi & 0xf) << 32));
             break;
         }
         break;
@@ -1865,21 +1865,21 @@ void helper_st_asi(target_ulong addr, uint64_t val, int asi, int size)
         {
             switch(size) {
             case 1:
-                stb_phys((a_target_phys_addr)addr
-                         | ((a_target_phys_addr)(asi & 0xf) << 32), val);
+                stb_phys((target_phys_addr_t)addr
+                         | ((target_phys_addr_t)(asi & 0xf) << 32), val);
                 break;
             case 2:
-                stw_phys((a_target_phys_addr)addr
-                         | ((a_target_phys_addr)(asi & 0xf) << 32), val);
+                stw_phys((target_phys_addr_t)addr
+                         | ((target_phys_addr_t)(asi & 0xf) << 32), val);
                 break;
             case 4:
             default:
-                stl_phys((a_target_phys_addr)addr
-                         | ((a_target_phys_addr)(asi & 0xf) << 32), val);
+                stl_phys((target_phys_addr_t)addr
+                         | ((target_phys_addr_t)(asi & 0xf) << 32), val);
                 break;
             case 8:
-                stq_phys((a_target_phys_addr)addr
-                         | ((a_target_phys_addr)(asi & 0xf) << 32), val);
+                stq_phys((target_phys_addr_t)addr
+                         | ((target_phys_addr_t)(asi & 0xf) << 32), val);
                 break;
             }
         }
@@ -3672,7 +3672,7 @@ void tlb_fill(target_ulong addr, int is_write, int mmu_idx, void *retaddr)
 #endif
 
 #ifndef TARGET_SPARC64
-void do_unassigned_access(a_target_phys_addr addr, int is_write, int is_exec,
+void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
                           int is_asi, int size)
 {
     CPUState *saved_env;
@@ -3714,7 +3714,7 @@ void do_unassigned_access(a_target_phys_addr addr, int is_write, int is_exec,
     env = saved_env;
 }
 #else
-void do_unassigned_access(a_target_phys_addr addr, int is_write, int is_exec,
+void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
                           int is_asi, int size)
 {
 #ifdef DEBUG_UNASSIGNED