pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/gxemul Restore these changes that were lost ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2d4b812ae446
branches: trunk
changeset: 397559:2d4b812ae446
user: skrll <skrll%pkgsrc.org@localhost>
date: Sun Jun 30 20:33:02 2019 +0000
description:
Restore these changes that were lost in a recent update
When emulating the MIPS DIV and DDIV instructions, check for divide
overflow instead of performing the overflowing divide on the host and
crashing the emulator. This is needed to run recent versions of the
NetBSD test suite on an emulated MIPS system.
implement trap with immediate instructions present in MIPS32.
diffstat:
emulators/gxemul/Makefile | 4 +-
emulators/gxemul/distinfo | 3 +-
emulators/gxemul/patches/patch-src_cpus_cpu__mips__instr.cc | 160 ++++++++++++
3 files changed, 164 insertions(+), 3 deletions(-)
diffs (194 lines):
diff -r a54a599f1a7e -r 2d4b812ae446 emulators/gxemul/Makefile
--- a/emulators/gxemul/Makefile Sun Jun 30 20:14:13 2019 +0000
+++ b/emulators/gxemul/Makefile Sun Jun 30 20:33:02 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2019/06/02 09:19:58 gson Exp $
+# $NetBSD: Makefile,v 1.66 2019/06/30 20:33:02 skrll Exp $
DISTNAME= gxemul-0.6.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gxemul/}
diff -r a54a599f1a7e -r 2d4b812ae446 emulators/gxemul/distinfo
--- a/emulators/gxemul/distinfo Sun Jun 30 20:14:13 2019 +0000
+++ b/emulators/gxemul/distinfo Sun Jun 30 20:33:02 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2019/06/02 09:19:58 gson Exp $
+$NetBSD: distinfo,v 1.59 2019/06/30 20:33:02 skrll Exp $
SHA1 (gxemul-0.6.1.tar.gz) = 150e495e91a968a49ffc7fe2390c3edff100508d
RMD160 (gxemul-0.6.1.tar.gz) = 0434bff07970d8828531d222cc8b95c64c2d62f1
@@ -9,6 +9,7 @@
SHA1 (patch-src_components_cpu_M88K__CPUComponent.cc) = 4b456721aa0639b91d2dab82fb28f61a951ec8f4
SHA1 (patch-src_components_cpu_MIPS__CPUComponent.cc) = 9bcb304937ccfa491e37da6f57729854294c420d
SHA1 (patch-src_console_console.cc) = 0b9c07eaa26a39b20a6f6769cdf02208fc9667d3
+SHA1 (patch-src_cpus_cpu__mips__instr.cc) = 1a39066fad8004b1bf0e9ae6186d943389c4d35f
SHA1 (patch-src_cpus_cpu_mips.cc) = ad6d9c8b452b1b8422d9194cadfa1c8c3d29ef21
SHA1 (patch-src_devices_dev__footbridge.cc) = 2dc76e65fff7e6c846d9d06b74bed76075b0c79a
SHA1 (patch-src_devices_dev__sh4.cc) = 81e3dcc01934c71389a91861343bc8aa32284160
diff -r a54a599f1a7e -r 2d4b812ae446 emulators/gxemul/patches/patch-src_cpus_cpu__mips__instr.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/gxemul/patches/patch-src_cpus_cpu__mips__instr.cc Sun Jun 30 20:33:02 2019 +0000
@@ -0,0 +1,160 @@
+$NetBSD: patch-src_cpus_cpu__mips__instr.cc,v 1.1 2019/06/30 20:33:02 skrll Exp $
+
+When emulating the MIPS DIV and DDIV instructions, check for divide
+overflow instead of performing the overflowing divide on the host and
+crashing the emulator. This is needed to run recent versions of the
+NetBSD test suite on an emulated MIPS system.
+
+implement trap with immediate instructions present in MIPS32.
+
+--- src/cpus/cpu_mips_instr.cc.orig 2019-06-29 16:17:02.938155374 +0000
++++ src/cpus/cpu_mips_instr.cc
+@@ -1275,6 +1275,8 @@ X(divu)
+ uint32_t res, rem;
+ if (b == 0)
+ res = 0, rem = a;
++ else if (a == (int32_t)0x80000000U && b == -1)
++ res = 0, rem = 0;
+ else
+ res = a / b, rem = a - b*res;
+ cpu->cd.mips.lo = (int32_t)res;
+@@ -1300,6 +1302,8 @@ X(ddivu)
+ uint64_t res, rem;
+ if (b == 0)
+ res = 0;
++ else if (a == (int64_t)0x8000000000000000ULL && b == -1)
++ res = 0;
+ else
+ res = a / b;
+ rem = a - b*res;
+@@ -1465,6 +1469,92 @@ X(tne)
+ }
+ }
+
++/*
++ * 1-register + 1-immediate:
++ *
++ * arg[0] = ptr to rs
++ * arg[1] = ([u]int16_t) immediate value
++ */
++
++X(tgei)
++{
++ MODE_int_t a = reg(ic->arg[0]), b = (int16_t)ic->arg[1];
++ if (a >= b) {
++ /* Synch. PC and cause an exception: */
++ int low_pc = ((size_t)ic - (size_t)cpu->cd.mips.cur_ic_page)
++ / sizeof(struct mips_instr_call);
++ cpu->pc &= ~((MIPS_IC_ENTRIES_PER_PAGE-1)
++ << MIPS_INSTR_ALIGNMENT_SHIFT);
++ cpu->pc += (low_pc << MIPS_INSTR_ALIGNMENT_SHIFT);
++ mips_cpu_exception(cpu, EXCEPTION_TR, 0, 0, 0, 0, 0, 0);
++ }
++}
++X(tgeiu)
++{
++ MODE_uint_t a = reg(ic->arg[0]), b = ic->arg[1];
++ if (a >= b) {
++ /* Synch. PC and cause an exception: */
++ int low_pc = ((size_t)ic - (size_t)cpu->cd.mips.cur_ic_page)
++ / sizeof(struct mips_instr_call);
++ cpu->pc &= ~((MIPS_IC_ENTRIES_PER_PAGE-1)
++ << MIPS_INSTR_ALIGNMENT_SHIFT);
++ cpu->pc += (low_pc << MIPS_INSTR_ALIGNMENT_SHIFT);
++ mips_cpu_exception(cpu, EXCEPTION_TR, 0, 0, 0, 0, 0, 0);
++ }
++}
++X(tlti)
++{
++ MODE_int_t a = reg(ic->arg[0]), b = (int16_t)ic->arg[1];
++ if (a < b) {
++ /* Synch. PC and cause an exception: */
++ int low_pc = ((size_t)ic - (size_t)cpu->cd.mips.cur_ic_page)
++ / sizeof(struct mips_instr_call);
++ cpu->pc &= ~((MIPS_IC_ENTRIES_PER_PAGE-1)
++ << MIPS_INSTR_ALIGNMENT_SHIFT);
++ cpu->pc += (low_pc << MIPS_INSTR_ALIGNMENT_SHIFT);
++ mips_cpu_exception(cpu, EXCEPTION_TR, 0, 0, 0, 0, 0, 0);
++ }
++}
++X(tltiu)
++{
++ MODE_uint_t a = reg(ic->arg[0]), b = ic->arg[1];
++ if (a < b) {
++ /* Synch. PC and cause an exception: */
++ int low_pc = ((size_t)ic - (size_t)cpu->cd.mips.cur_ic_page)
++ / sizeof(struct mips_instr_call);
++ cpu->pc &= ~((MIPS_IC_ENTRIES_PER_PAGE-1)
++ << MIPS_INSTR_ALIGNMENT_SHIFT);
++ cpu->pc += (low_pc << MIPS_INSTR_ALIGNMENT_SHIFT);
++ mips_cpu_exception(cpu, EXCEPTION_TR, 0, 0, 0, 0, 0, 0);
++ }
++}
++X(teqi)
++{
++ MODE_uint_t a = reg(ic->arg[0]), b = (int16_t)ic->arg[1];
++ if (a == b) {
++ /* Synch. PC and cause an exception: */
++ int low_pc = ((size_t)ic - (size_t)cpu->cd.mips.cur_ic_page)
++ / sizeof(struct mips_instr_call);
++ cpu->pc &= ~((MIPS_IC_ENTRIES_PER_PAGE-1)
++ << MIPS_INSTR_ALIGNMENT_SHIFT);
++ cpu->pc += (low_pc << MIPS_INSTR_ALIGNMENT_SHIFT);
++ mips_cpu_exception(cpu, EXCEPTION_TR, 0, 0, 0, 0, 0, 0);
++ }
++}
++X(tnei)
++{
++ MODE_uint_t a = reg(ic->arg[0]), b = ic->arg[1];
++ if (a != b) {
++ /* Synch. PC and cause an exception: */
++ int low_pc = ((size_t)ic - (size_t)cpu->cd.mips.cur_ic_page)
++ / sizeof(struct mips_instr_call);
++ cpu->pc &= ~((MIPS_IC_ENTRIES_PER_PAGE-1)
++ << MIPS_INSTR_ALIGNMENT_SHIFT);
++ cpu->pc += (low_pc << MIPS_INSTR_ALIGNMENT_SHIFT);
++ mips_cpu_exception(cpu, EXCEPTION_TR, 0, 0, 0, 0, 0, 0);
++ }
++}
++
+
+ /*
+ * 3-register arithmetic instructions:
+@@ -4478,6 +4568,37 @@ X(to_be_translated)
+ }
+ break;
+
++ case REGIMM_TGEI:
++ case REGIMM_TGEIU:
++ case REGIMM_TLTI:
++ case REGIMM_TLTIU:
++ case REGIMM_TEQI:
++ case REGIMM_TNEI:
++ switch (rt) {
++ case REGIMM_TGEI:
++ ic->f = instr(tgei);
++ break;
++ case REGIMM_TGEIU:
++ ic->f = instr(tgeiu);
++ break;
++ case REGIMM_TLTI:
++ ic->f = instr(tlti);
++ break;
++ case REGIMM_TLTIU:
++ ic->f = instr(tltiu);
++ break;
++ case REGIMM_TEQI:
++ ic->f = instr(teqi);
++ break;
++ case REGIMM_TNEI:
++ ic->f = instr(tnei);
++ break;
++ }
++
++ ic->arg[0] = (size_t)&cpu->cd.mips.gpr[rs];
++ ic->arg[1] = imm;
++ break;
++
+ default:if (!cpu->translation_readahead)
+ fatal("UNIMPLEMENTED regimm rt=%i\n", rt);
+ goto bad;
Home |
Main Index |
Thread Index |
Old Index