Mon Feb 6 05:37:40 2012 UTC ()

Fix a bug in blx rM register emulation on arm.


(matt)

diff -r1.34 -r1.35 pkgsrc/emulators/gxemul/distinfo
diff -r0 -r1.1 pkgsrc/emulators/gxemul/patches/patch-ag

--- pkgsrc/emulators/gxemul/distinfo 2011/10/26 06:57:30 1.34
+++ pkgsrc/emulators/gxemul/distinfo 2012/02/06 05:37:40 1.35

 @@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.34 2011/10/26 06:57:30 mrg Exp $
+$NetBSD: distinfo,v 1.35 2012/02/06 05:37:40 matt Exp $
 SHA1 (gxemul-0.6.0.tar.gz) = aa37ad5f200eee045b1da2b1d3f651401cf474af
 RMD160 (gxemul-0.6.0.tar.gz) = ac6291a5f8bc9c0d1988d3ce39750339fe90a8ce
 Size (gxemul-0.6.0.tar.gz) = 3598795 bytes
 SHA1 (patch-aa) = 6f2c0dc94606ba213bcc73527ea4bef997c89c45
 SHA1 (patch-ab) = ebd64a2b56cd4140522c567b90dcbfb9440b9db2
 SHA1 (patch-ad) = a8757e7397ec3cc301d02bdf93654f55d558d29f
 SHA1 (patch-ae) = 19ef822c16f0f6dd50aea719e0bc797c39d1f9c0
 SHA1 (patch-af) = 8304ff5d8f779ac60f8d416d27e0a183e0e47d94
 SHA1 (patch-ag) = 9d13bf6f6e6038e114a45cfbd03e4e52ac60d2c7

$NetBSD: patch-ag,v 1.1 2012/02/06 05:37:40 matt Exp $

--- src/cpus/cpu_arm_instr.cc.orig	2012-02-06 05:14:31.000000000 +0000
+++ src/cpus/cpu_arm_instr.cc
@@ -2631,6 +2631,7 @@ X(to_be_translated)
 					ic->f = cond_instr(bx);
 			}
 			ic->arg[0] = (size_t)(&cpu->cd.arm.r[rm]);
+			ic->arg[2] = (addr & 0xffc) + 4;
                         break;
                 }
 		if ((iword & 0x0fb00ff0) == 0x1000090) {