Skip to contentSkip to conversation

fix HelenOS illegal instruction issue on sparc64

PATCH Applied Igor V. Kovalenko 2 participants 4 messages May 16, 2010

lore
Share & tools
lore
#0 lore raw

cover fix HelenOS illegal instruction issue on sparc64

The following series fix a couple of typos in sparc target which cause illegal instruction issue booting HelenOS on sparc64.

---

Igor V. Kovalenko (2):
sparc64: fix mmu demap operand typo
sparc64: fix TT_WOTHER value

 target-sparc/cpu.h       |    2 +-
 target-sparc/op_helper.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Signature · 2 lines
Kind regards,
Igor V. Kovalenko
#1 lore raw

PATCH 1/2 sparc64: fix mmu demap operand typo

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

- must use store address operand to demap, not store value

---
 target-sparc/op_helper.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
target-sparc/op_helper.c +2 -2
index fcfd3f3..ec39244 100644
@@ -2877,7 +2877,7 @@ void helper_st_asi(target_ulong addr, target_ulong val, int asi, int size)
             return;
         }
     case 0x57: // I-MMU demap
-        demap_tlb(env->itlb, val, "immu", env);
+        demap_tlb(env->itlb, addr, "immu", env);
         return;
     case 0x58: // D-MMU regs
         {
@@ -2942,7 +2942,7 @@ void helper_st_asi(target_ulong addr, target_ulong val, int asi, int size)
             return;
         }
     case 0x5f: // D-MMU demap
-        demap_tlb(env->dtlb, val, "dmmu", env);
+        demap_tlb(env->dtlb, addr, "dmmu", env);
         return;
     case 0x49: // Interrupt data receive
         // XXX
#2 lore raw

PATCH 2/2 sparc64: fix TT_WOTHER value

In reply to Igor V. Kovalenko

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

- fix off by one error in spill trap number bit for other window (must be bit 5)
- fixes invalid instruction issue with HelenOS

---
 target-sparc/cpu.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
target-sparc/cpu.h +1 -1
index 22f3ad0..27b020b 100644
@@ -79,7 +79,7 @@
 #define TT_DPROT    0x6c
 #define TT_SPILL    0x80
 #define TT_FILL     0xc0
-#define TT_WOTHER   0x10
+#define TT_WOTHER   (1 << 5)
 #define TT_TRAP     0x100
 #endif
 
Applied
#3 lore raw
In reply to Igor V. Kovalenko

Thanks, applied both.

Quoted 20 lines · Igor V. Kovalenko

The following series fix a couple of typos in sparc target which cause
illegal instruction issue booting HelenOS on sparc64.

---

Igor V. Kovalenko (2):
sparc64: fix mmu demap operand typo
sparc64: fix TT_WOTHER value

  target-sparc/cpu.h       |    2 +-
  target-sparc/op_helper.c |    4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)

--
Kind regards,

Igor V. Kovalenko