From 34e87bf480bb288b5e43b84d95cd48a577671a94 Mon Sep 17 00:00:00 2001
From: christos <christos>
Date: Thu, 11 May 2017 12:38:30 +0000
Subject: fix cats kernel: TODO: see cpu_arm_instr_dpi; non-zero steps but
 still under 256 is not implemented yet to_be_translated(): TODO:
 unimplemented instruction: ebf61a60:  e28fc600     add     ip,pc,#0

---
 emulators/gxemul/patches/patch-ag | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'emulators')

diff --git a/emulators/gxemul/patches/patch-ag b/emulators/gxemul/patches/patch-ag
index 2db9b0a096a..9a62a220c41 100644
--- a/emulators/gxemul/patches/patch-ag
+++ b/emulators/gxemul/patches/patch-ag
@@ -1,11 +1,12 @@
-$NetBSD: patch-ag,v 1.3 2014/12/08 20:55:19 ryoon Exp $
+$NetBSD: patch-ag,v 1.4 2017/05/11 12:38:30 christos Exp $
 
-enable all CPSR->SPSR copy values, instead of hard coding 3 out of 15.
+- enable all CPSR->SPSR copy values, instead of hard coding 3 out of 15.
+- allow immediate to be zero with a non-zero shift. caused by:
+	ebf61a60:  e28fc600     add     ip,pc,#0
 
-
---- src/cpus/cpu_arm_instr.cc.orig	2014-08-17 08:45:15.000000000 +0000
-+++ src/cpus/cpu_arm_instr.cc
-@@ -2670,6 +2670,7 @@ X(to_be_translated)
+--- src/cpus/cpu_arm_instr.cc.orig	2014-08-17 04:45:15.000000000 -0400
++++ src/cpus/cpu_arm_instr.cc	2017-05-11 08:36:16.634585212 -0400
+@@ -2670,6 +2670,7 @@
  					ic->f = cond_instr(bx);
  			}
  			ic->arg[0] = (size_t)(&cpu->cd.arm.r[rm]);
@@ -13,3 +14,12 @@ enable all CPSR->SPSR copy values, instead of hard coding 3 out of 15.
                          break;
                  }
  		if ((iword & 0x0fb00ff0) == 0x1000090) {
+@@ -2888,7 +2889,7 @@
+ 			while (r8-- > 0)
+ 				imm = (imm >> 2) | ((imm & 3) << 30);
+ 
+-			if (steps != 0 && imm < 256) {
++			if (steps != 0 && imm < 256 && imm != 0) {
+ 				if (!cpu->translation_readahead)
+ 					fatal("TODO: see cpu_arm_instr_dpi; non-zero steps but still under 256 is not implemented yet\n");
+ 				goto bad;
-- 
cgit v1.2.3