Skip to contentSkip to conversation

sparc64: fix 128-bit atomic load from nucleus context v1

PATCH Applied Igor V. Kovalenko 2 participants 2 messages May 28, 2010 – May 29, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sparc64: fix 128-bit atomic load from nucleus context v1

From: Igor V. Kovalenko <[email protected]>

- change 128-bit atomic loads to reference nucleus context v0->v1: dropped disassembler change

---
 target-sparc/op_helper.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
target-sparc/op_helper.c +5 -5
index edeeb44..f468e7b 100644
@@ -3060,19 +3060,19 @@ void helper_ldda_asi(target_ulong addr, int asi, int rd)
     case 0x2c: // Nucleus quad LDD 128 bit atomic LE
         helper_check_align(addr, 0xf);
         if (rd == 0) {
-            env->gregs[1] = ldq_kernel(addr + 8);
+            env->gregs[1] = ldq_nucleus(addr + 8);
             if (asi == 0x2c)
                 bswap64s(&env->gregs[1]);
         } else if (rd < 8) {
-            env->gregs[rd] = ldq_kernel(addr);
-            env->gregs[rd + 1] = ldq_kernel(addr + 8);
+            env->gregs[rd] = ldq_nucleus(addr);
+            env->gregs[rd + 1] = ldq_nucleus(addr + 8);
             if (asi == 0x2c) {
                 bswap64s(&env->gregs[rd]);
                 bswap64s(&env->gregs[rd + 1]);
             }
         } else {
-            env->regwptr[rd] = ldq_kernel(addr);
-            env->regwptr[rd + 1] = ldq_kernel(addr + 8);
+            env->regwptr[rd] = ldq_nucleus(addr);
+            env->regwptr[rd + 1] = ldq_nucleus(addr + 8);
             if (asi == 0x2c) {
                 bswap64s(&env->regwptr[rd]);
                 bswap64s(&env->regwptr[rd + 1]);
Applied
#1 lore raw

Thanks, applied.

Quoted 41 lines · Igor V. Kovalenko

From: Igor V. Kovalenko <[email protected]>

- change 128-bit atomic loads to reference nucleus context v0->v1: dropped disassembler change

---
 target-sparc/op_helper.c |   10 +++++-----

 1 files changed, 5 insertions(+), 5 deletions(-)
target-sparc/op_helper.c +0 -0
index edeeb44..f468e7b 100644
@@ -3060,19 +3060,19 @@ void helper_ldda_asi(target_ulong addr, int asi, int rd)

    case 0x2c: // Nucleus quad LDD 128 bit atomic LE helper_check_align(addr, 0xf);
        if (rd == 0) {
-            env->gregs[1] = ldq_kernel(addr + 8);
+            env->gregs[1] = ldq_nucleus(addr + 8); if (asi == 0x2c) bswap64s(&env->gregs[1]);
        } else if (rd < 8) {
-            env->gregs[rd] = ldq_kernel(addr);
-            env->gregs[rd + 1] = ldq_kernel(addr + 8);
+            env->gregs[rd] = ldq_nucleus(addr);
+            env->gregs[rd + 1] = ldq_nucleus(addr + 8); if (asi == 0x2c) { bswap64s(&env->gregs[rd]); bswap64s(&env->gregs[rd + 1]);
            }
        } else {
-            env->regwptr[rd] = ldq_kernel(addr);
-            env->regwptr[rd + 1] = ldq_kernel(addr + 8);
+            env->regwptr[rd] = ldq_nucleus(addr);
+            env->regwptr[rd + 1] = ldq_nucleus(addr + 8); if (asi == 0x2c) { bswap64s(&env->regwptr[rd]); bswap64s(&env->regwptr[rd + 1]);