pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/gxemul gxemul: Fix build with clang 7svn
details: https://anonhg.NetBSD.org/pkgsrc/rev/82dfec89b601
branches: trunk
changeset: 377759:82dfec89b601
user: kamil <kamil%pkgsrc.org@localhost>
date: Wed Mar 21 17:39:42 2018 +0000
description:
gxemul: Fix build with clang 7svn
Fix C++11 literals, they are now fatal. Reverting to C++98 does not work
as it is, as this code uses C++11 extensions like 'PRIx32' macros.
Extend one int to long in order to handle all values in a switch() case.
No functional change intended.
diffstat:
emulators/gxemul/distinfo | 57 +-
emulators/gxemul/patches/patch-ad | 55 +-
emulators/gxemul/patches/patch-ag | 34 +-
emulators/gxemul/patches/patch-src_console_x11.cc | 15 +
emulators/gxemul/patches/patch-src_cpus_cpu.cc | 60 +
emulators/gxemul/patches/patch-src_cpus_cpu__alpha.cc | 64 +
emulators/gxemul/patches/patch-src_cpus_cpu__alpha__palcode.cc | 38 +
emulators/gxemul/patches/patch-src_cpus_cpu__dyntrans.cc | 166 +++++
emulators/gxemul/patches/patch-src_cpus_cpu__m88k.cc | 191 +++++
emulators/gxemul/patches/patch-src_cpus_cpu__m88k__instr.cc | 46 +
emulators/gxemul/patches/patch-src_cpus_cpu__m88k__instr__loadstore.cc | 20 +
emulators/gxemul/patches/patch-src_cpus_cpu__ppc.cc | 296 +++++++++
emulators/gxemul/patches/patch-src_cpus_cpu__ppc__instr.cc | 20 +
emulators/gxemul/patches/patch-src_cpus_cpu__sh.cc | 189 +++++
emulators/gxemul/patches/patch-src_cpus_cpu_mips.cc | 327 +++++++++-
emulators/gxemul/patches/patch-src_cpus_cpu_mips_instr.cc | 35 +-
emulators/gxemul/patches/patch-src_cpus_memory__alpha.cc | 53 +
emulators/gxemul/patches/patch-src_cpus_memory__mips__v2p.cc | 53 +
emulators/gxemul/patches/patch-src_cpus_memory__ppc.cc | 20 +
emulators/gxemul/patches/patch-src_cpus_memory__sh.cc | 27 +
emulators/gxemul/patches/patch-src_debugger_debugger.cc | 23 +
emulators/gxemul/patches/patch-src_debugger_debugger__cmds.cc | 141 ++++
emulators/gxemul/patches/patch-src_devices_bus__pci.cc | 20 +
emulators/gxemul/patches/patch-src_devices_dev__algor.cc | 32 +
emulators/gxemul/patches/patch-src_devices_dev__dreamcast__gdrom.cc | 20 +
emulators/gxemul/patches/patch-src_devices_dev__dreamcast__maple.cc | 46 +
emulators/gxemul/patches/patch-src_devices_dev__lca.cc | 56 +
emulators/gxemul/patches/patch-src_devices_dev__pvr.cc | 199 ++++++
emulators/gxemul/patches/patch-src_devices_dev__sgi__mardigras.cc | 29 +
emulators/gxemul/patches/patch-src_devices_dev__sh4.cc | 117 +++-
emulators/gxemul/patches/patch-src_devices_dev__vga.cc | 22 +
emulators/gxemul/patches/patch-src_devices_dev__vr41xx.cc | 43 +
emulators/gxemul/patches/patch-src_devices_dev__wdc.cc | 47 +
emulators/gxemul/patches/patch-src_disk_bootblock.cc | 30 +
emulators/gxemul/patches/patch-src_disk_diskimage.cc | 20 +
emulators/gxemul/patches/patch-src_file_file__elf.cc | 117 +++
emulators/gxemul/patches/patch-src_file_file__raw.cc | 25 +
emulators/gxemul/patches/patch-src_machines_machine__landisk.cc | 20 +
emulators/gxemul/patches/patch-src_machines_machine__pmax.cc | 50 +-
emulators/gxemul/patches/patch-src_machines_machine__test.cc | 94 ++
emulators/gxemul/patches/patch-src_main_GXemul.cc | 20 +
emulators/gxemul/patches/patch-src_old__main_emul.cc | 53 +
emulators/gxemul/patches/patch-src_old__main_main.cc | 29 +
emulators/gxemul/patches/patch-src_old__main_memory.cc | 42 +
emulators/gxemul/patches/patch-src_old__main_settings.cc | 36 +
emulators/gxemul/patches/patch-src_promemul_arcbios.cc | 209 ++++++
emulators/gxemul/patches/patch-src_promemul_dec__prom.cc | 20 +
emulators/gxemul/patches/patch-src_promemul_dreamcast.cc | 26 +
emulators/gxemul/patches/patch-src_promemul_ps2__bios.cc | 46 +
emulators/gxemul/patches/patch-src_symbol_symbol.cc | 38 +
50 files changed, 3401 insertions(+), 35 deletions(-)
diffs (truncated from 3737 to 300 lines):
diff -r f7012b445704 -r 82dfec89b601 emulators/gxemul/distinfo
--- a/emulators/gxemul/distinfo Wed Mar 21 17:32:44 2018 +0000
+++ b/emulators/gxemul/distinfo Wed Mar 21 17:39:42 2018 +0000
@@ -1,24 +1,67 @@
-$NetBSD: distinfo,v 1.51 2017/09/04 11:19:43 ryoon Exp $
+$NetBSD: distinfo,v 1.52 2018/03/21 17:39:42 kamil Exp $
SHA1 (gxemul-0.6.0.1.tar.gz) = 8a9b7a6c08628c2a59a6e7e9c7c449c3826b4744
RMD160 (gxemul-0.6.0.1.tar.gz) = 6943173d4149bfe40218715b8ed2c82b5b361e50
SHA512 (gxemul-0.6.0.1.tar.gz) = 028764c751d67bf5da02ee2c34e6607660c2044e431b06c3d6799ba4e76f605b8c02afaa5f59c3059aff6253e35149831580bb13383121fb5ac0392c12d2aec2
Size (gxemul-0.6.0.1.tar.gz) = 5420978 bytes
SHA1 (patch-aa) = 6f2c0dc94606ba213bcc73527ea4bef997c89c45
-SHA1 (patch-ad) = a8757e7397ec3cc301d02bdf93654f55d558d29f
+SHA1 (patch-ad) = 8dceff813ebf3702f8b48fb535708f1223254814
SHA1 (patch-ae) = 19ef822c16f0f6dd50aea719e0bc797c39d1f9c0
-SHA1 (patch-ag) = 00eb698213b86e84d72b9ae5ece789ec37aea1ab
+SHA1 (patch-ag) = db1c914220bf3bae6f61faba5ba9b7ed8ea995bd
SHA1 (patch-src_components_cpu_CPUDyntransComponent.cc) = 1a70375b3ed409ef43122ce7e6935c07b4ed386d
SHA1 (patch-src_components_cpu_M88K__CPUComponent.cc) = 931cdc9a806e9ff48dccb2a63873c52491336b30
SHA1 (patch-src_components_cpu_MIPS__CPUComponent.cc) = 75d8276092fcdc9f548f874e5807ae8e6a2b9eae
SHA1 (patch-src_console_console.cc) = 0b9c07eaa26a39b20a6f6769cdf02208fc9667d3
-SHA1 (patch-src_cpus_cpu_mips.cc) = d239116e4ce5e040a1bdf39b803ca9a05500be53
-SHA1 (patch-src_cpus_cpu_mips_instr.cc) = be40f86a103d2366d13a884d957848d4f680dc61
+SHA1 (patch-src_console_x11.cc) = e1efce66afa230310615453fc6f8427b00c33b08
+SHA1 (patch-src_cpus_cpu.cc) = c882bc71844588e83e172b693142b1c725f86d17
+SHA1 (patch-src_cpus_cpu__alpha.cc) = 1ef38e5930018f310220efb0bf7f357fd5a9af7b
+SHA1 (patch-src_cpus_cpu__alpha__palcode.cc) = ae892bb7191e199329952feeb544fe31bd5407e2
+SHA1 (patch-src_cpus_cpu__dyntrans.cc) = d3887e19e1a153cc16fd38422e24efab8bfb672e
+SHA1 (patch-src_cpus_cpu__m88k.cc) = b21d57f101ef6c7275a70c2052ce089fb6a256c5
+SHA1 (patch-src_cpus_cpu__m88k__instr.cc) = 35fc38cb5a4efedf15e22be25196c39e817aeeb8
+SHA1 (patch-src_cpus_cpu__m88k__instr__loadstore.cc) = f4837cd03c47eb980d4ca815e9dc953eaa13ca6c
+SHA1 (patch-src_cpus_cpu__ppc.cc) = 013a6a6ea28acc1ba1751813b5dfa3d11d251427
+SHA1 (patch-src_cpus_cpu__ppc__instr.cc) = cdc664f35cdb289380bb959f1b07c95151b60eed
+SHA1 (patch-src_cpus_cpu__sh.cc) = b72eb6b670fad93198c9ee7d1bb57c0a69027a3a
+SHA1 (patch-src_cpus_cpu_mips.cc) = 0fdeed0a52b4b8a2e256e0f1084cf5a2131a6dce
+SHA1 (patch-src_cpus_cpu_mips_instr.cc) = 5166ef06cbacfd8ecb73796da6d7c511ed42728d
+SHA1 (patch-src_cpus_memory__alpha.cc) = 9bea508cc59aa6856928f0d6f5964f5f24ac648e
+SHA1 (patch-src_cpus_memory__mips__v2p.cc) = 2b859ffa219ded4e7c4a6a0ad3047e4c444d472d
+SHA1 (patch-src_cpus_memory__ppc.cc) = e321cc7acaa4a61fda91f46b05f10863d407ae9f
+SHA1 (patch-src_cpus_memory__sh.cc) = a13b3da5acd134a9145186b8294eec19ce4f6c37
+SHA1 (patch-src_debugger_debugger.cc) = c37a93845d0b77350a22c793d84da4a05342423a
+SHA1 (patch-src_debugger_debugger__cmds.cc) = cc02739c1561b4b1e8e503bcdd8a7fcfa183f5b2
+SHA1 (patch-src_devices_bus__pci.cc) = 5a4b7360a8701055d92d22489c777884338f1f38
+SHA1 (patch-src_devices_dev__algor.cc) = 0d841679b1f230dfd52fe02836f9ff544e78cf21
+SHA1 (patch-src_devices_dev__dreamcast__gdrom.cc) = 673fbb19f530486cb64a14ac941f62db493b0900
+SHA1 (patch-src_devices_dev__dreamcast__maple.cc) = 933917c91b9dcbd2f97090760477525c3ee044a8
SHA1 (patch-src_devices_dev__footbridge.cc) = 2dc76e65fff7e6c846d9d06b74bed76075b0c79a
-SHA1 (patch-src_devices_dev__sh4.cc) = fffd194470bbe830369c814595e0bea968f43809
+SHA1 (patch-src_devices_dev__lca.cc) = 3dadd75e3c561b300c0d9fc1aff086da92c2c1ae
+SHA1 (patch-src_devices_dev__pvr.cc) = 8444baf6379ed8b4c6b2fe8943dc7f808b195981
+SHA1 (patch-src_devices_dev__sgi__mardigras.cc) = 2585bc8e0117a36e214364e5ff875754f250fae9
+SHA1 (patch-src_devices_dev__sh4.cc) = 83ab4cc46a96721da9472f392f8e91a26ee557a7
+SHA1 (patch-src_devices_dev__vga.cc) = b7e889f7ecec48ff446a2d64fe0587118de8aa21
+SHA1 (patch-src_devices_dev__vr41xx.cc) = 5daf48f57a9f16d695f913341e92944816dbf062
+SHA1 (patch-src_devices_dev__wdc.cc) = 38038c02aab576c3574a1cb468f6e7bbefe5f5da
+SHA1 (patch-src_disk_bootblock.cc) = 11dd3135cb433ced29972fe28e18568025beaf82
+SHA1 (patch-src_disk_diskimage.cc) = 05f077314ee76cd0fd77582d5b725be491a42857
+SHA1 (patch-src_file_file__elf.cc) = be7e20bfca2d10e2f7fdbf0289483416d21dec3e
+SHA1 (patch-src_file_file__raw.cc) = 9c34c96cca79b795554d307cd134334ae0eb568c
SHA1 (patch-src_include_components_CPUDyntransComponent.h) = 4fa3c327c4ce5ee9e39e7bc49ce6029b2a7da100
SHA1 (patch-src_include_components_M88K__CPUComponent.h) = afd07ae4df33d0c0a9d3d8c15dca4ef9ee7dd916
SHA1 (patch-src_include_components_MIPS__CPUComponent.h) = 4e49da9af0d220a1ea7c4520d8e7e53d8d84c155
SHA1 (patch-src_include_mips_cpu_types.h) = ae5fcfa68596f4705fc07434fcd95a3ac6205763
SHA1 (patch-src_include_refcount__ptr.h) = 8021524ff16d3a9de65bb6188fb8c07296c5c3b7
-SHA1 (patch-src_machines_machine__pmax.cc) = 19b97031837f9fa911b02d624f824834ce8c0e89
+SHA1 (patch-src_machines_machine__landisk.cc) = ec3fd4916ab6092fb004e03e711653dbc20f5fc0
+SHA1 (patch-src_machines_machine__pmax.cc) = d556a834cd656d53a5aa851d5e89f655935aeb95
+SHA1 (patch-src_machines_machine__test.cc) = fbb54c473d77d4fe6bfb3cd01b72113991f77dc5
+SHA1 (patch-src_main_GXemul.cc) = a4ce4bd37347eaffc03216e27667fe636d35de29
+SHA1 (patch-src_old__main_emul.cc) = c8ef84dbed5adba7ee95dcc030ec190ffa002e67
+SHA1 (patch-src_old__main_main.cc) = ad0c6ca2712e69b4813eb6b712cd80033be04b7c
+SHA1 (patch-src_old__main_memory.cc) = 247ddf938a270b5069e45aca84ae36fe1a252124
+SHA1 (patch-src_old__main_settings.cc) = 759498320709b693088a177d9d264895306c825d
+SHA1 (patch-src_promemul_arcbios.cc) = 07881593bb29cc125ebaa1e424ed1fa80c52babf
+SHA1 (patch-src_promemul_dec__prom.cc) = 31b2e001784cbb15a838a1a42576c2935b44ca7c
+SHA1 (patch-src_promemul_dreamcast.cc) = eed1c7a713918ce782cf4c717758980038c8c065
+SHA1 (patch-src_promemul_ps2__bios.cc) = 17b4a27b61e588481e063c0ac509b55ad28a1127
+SHA1 (patch-src_symbol_symbol.cc) = 4edc42207d7c4af193b55fd4d9e03eee4180a7b2
diff -r f7012b445704 -r 82dfec89b601 emulators/gxemul/patches/patch-ad
--- a/emulators/gxemul/patches/patch-ad Wed Mar 21 17:32:44 2018 +0000
+++ b/emulators/gxemul/patches/patch-ad Wed Mar 21 17:39:42 2018 +0000
@@ -1,12 +1,42 @@
-$NetBSD: patch-ad,v 1.1 2011/07/17 12:49:17 mrg Exp $
+$NetBSD: patch-ad,v 1.2 2018/03/21 17:39:42 kamil Exp $
patch to fix big-endian mips support from matt%netbsd.org@localhost
-
+Fix C++11 literals.
diff -rup src/cpus/cpu_mips_coproc.cc src/cpus/cpu_mips_coproc.cc
---- src/cpus/cpu_mips_coproc.cc 2009-06-21 09:03:48.000000000 -0700
-+++ src/cpus/cpu_mips_coproc.cc 2009-11-12 12:22:12.000000000 -0800
-@@ -1987,6 +1987,13 @@ void coproc_function(struct cpu *cpu, st
+--- src/cpus/cpu_mips_coproc.cc.orig 2014-08-17 08:45:15.000000000 +0000
++++ src/cpus/cpu_mips_coproc.cc
+@@ -1628,19 +1628,19 @@ void coproc_tlbwri(struct cpu *cpu, int
+ /* Debug dump of the previous entry at that index: */
+ fatal("{ old TLB entry at index %02x:", index);
+ if (cpu->cd.mips.cpu_type.mmu_model == MMU3K) {
+- fatal(" hi=%08"PRIx32, (uint32_t)cp->tlbs[index].hi);
+- fatal(" lo=%08"PRIx32, (uint32_t)cp->tlbs[index].lo0);
++ fatal(" hi=%08" PRIx32, (uint32_t)cp->tlbs[index].hi);
++ fatal(" lo=%08" PRIx32, (uint32_t)cp->tlbs[index].lo0);
+ } else {
+ if (cpu->is_32bit) {
+- fatal(" mask=%08"PRIx32,(uint32_t)cp->tlbs[index].mask);
+- fatal(" hi=%08"PRIx32, (uint32_t)cp->tlbs[index].hi);
+- fatal(" lo0=%08"PRIx32, (uint32_t)cp->tlbs[index].lo0);
+- fatal(" lo1=%08"PRIx32, (uint32_t)cp->tlbs[index].lo1);
++ fatal(" mask=%08" PRIx32,(uint32_t)cp->tlbs[index].mask);
++ fatal(" hi=%08" PRIx32, (uint32_t)cp->tlbs[index].hi);
++ fatal(" lo0=%08" PRIx32, (uint32_t)cp->tlbs[index].lo0);
++ fatal(" lo1=%08" PRIx32, (uint32_t)cp->tlbs[index].lo1);
+ } else {
+- fatal(" mask=%016"PRIx64, cp->tlbs[index].mask);
+- fatal(" hi=%016"PRIx64, cp->tlbs[index].hi);
+- fatal(" lo0=%016"PRIx64, cp->tlbs[index].lo0);
+- fatal(" lo1=%016"PRIx64, cp->tlbs[index].lo1);
++ fatal(" mask=%016" PRIx64, cp->tlbs[index].mask);
++ fatal(" hi=%016" PRIx64, cp->tlbs[index].hi);
++ fatal(" lo0=%016" PRIx64, cp->tlbs[index].lo0);
++ fatal(" lo1=%016" PRIx64, cp->tlbs[index].lo1);
+ }
+ }
+ fatal(" }\n");
+@@ -1993,6 +1993,13 @@ void coproc_function(struct cpu *cpu, st
if (cpnr < 2 && (((function & 0x03e007f8) == (COPz_MTCz << 21))
|| ((function & 0x03e007f8) == (COPz_DMTCz << 21)))) {
@@ -20,7 +50,7 @@
if (unassemble_only) {
debug("%s%i\t%s,", copz==COPz_DMTCz? "dmtc" : "mtc",
cpnr, regnames[rt]);
-@@ -1996,16 +2003,10 @@ void coproc_function(struct cpu *cpu, st
+@@ -2002,16 +2009,10 @@ void coproc_function(struct cpu *cpu, st
debug("r%i", rd);
if (function & 7)
debug(",%i", (int)(function & 7));
@@ -38,3 +68,16 @@
coproc_register_write(cpu, cpu->cd.mips.coproc[cpnr], rd,
&tmpvalue, copz == COPz_DMTCz, function & 7);
return;
+@@ -2225,10 +2226,9 @@ void coproc_function(struct cpu *cpu, st
+ return;
+ }
+
+- fatal("cpu%i: UNIMPLEMENTED coproc%i function %08"PRIx32" "
+- "(pc = %016"PRIx64")\n", cpu->cpu_id, cp->coproc_nr,
++ fatal("cpu%i: UNIMPLEMENTED coproc%i function %08" PRIx32 " "
++ "(pc = %016" PRIx64 ")\n", cpu->cpu_id, cp->coproc_nr,
+ (uint32_t)function, cpu->pc);
+
+ mips_cpu_exception(cpu, EXCEPTION_CPU, 0, 0, cp->coproc_nr, 0, 0, 0);
+ }
+-
diff -r f7012b445704 -r 82dfec89b601 emulators/gxemul/patches/patch-ag
--- a/emulators/gxemul/patches/patch-ag Wed Mar 21 17:32:44 2018 +0000
+++ b/emulators/gxemul/patches/patch-ag Wed Mar 21 17:39:42 2018 +0000
@@ -1,12 +1,31 @@
-$NetBSD: patch-ag,v 1.4 2017/05/11 12:38:30 christos Exp $
+$NetBSD: patch-ag,v 1.5 2018/03/21 17:39:42 kamil Exp $
- 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
+- Fix C++11 literals.
---- 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 @@
+--- src/cpus/cpu_arm_instr.cc.orig 2014-08-17 08:45:15.000000000 +0000
++++ src/cpus/cpu_arm_instr.cc
+@@ -215,7 +215,7 @@ X(invalid) {
+
+ fatal("FATAL ERROR: An internal error occured in the ARM"
+ " dyntrans code. Please contact the author with detailed"
+- " repro steps on how to trigger this bug. pc = 0x%08"PRIx32"\n",
++ " repro steps on how to trigger this bug. pc = 0x%08" PRIx32 "\n",
+ (uint32_t)cpu->pc);
+
+ cpu->cd.arm.next_ic = ¬hing_call;
+@@ -803,7 +803,7 @@ X(msr_imm_spsr)
+ cpu->pc &= ~((ARM_IC_ENTRIES_PER_PAGE-1) << ARM_INSTR_ALIGNMENT_SHIFT);
+ cpu->pc += (low_pc << ARM_INSTR_ALIGNMENT_SHIFT);
+ old_pc = cpu->pc;
+- printf("msr_spsr: old pc = 0x%08"PRIx32"\n", old_pc);
++ printf("msr_spsr: old pc = 0x%08" PRIx32 "\n", old_pc);
+ }
+ exit(1);
+ }
+@@ -2670,6 +2670,7 @@ X(to_be_translated)
ic->f = cond_instr(bx);
}
ic->arg[0] = (size_t)(&cpu->cd.arm.r[rm]);
@@ -14,7 +33,7 @@
break;
}
if ((iword & 0x0fb00ff0) == 0x1000090) {
-@@ -2888,7 +2889,7 @@
+@@ -2888,7 +2889,7 @@ X(to_be_translated)
while (r8-- > 0)
imm = (imm >> 2) | ((imm & 3) << 30);
@@ -23,3 +42,8 @@
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;
+@@ -3205,4 +3206,3 @@ okay:
+ #include "cpu_dyntrans.cc"
+ #undef DYNTRANS_TO_BE_TRANSLATED_TAIL
+ }
+-
diff -r f7012b445704 -r 82dfec89b601 emulators/gxemul/patches/patch-src_console_x11.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/gxemul/patches/patch-src_console_x11.cc Wed Mar 21 17:39:42 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_console_x11.cc,v 1.1 2018/03/21 17:39:42 kamil Exp $
+
+Fix C++11 literals.
+
+--- src/console/x11.cc.orig 2014-08-17 08:45:15.000000000 +0000
++++ src/console/x11.cc
+@@ -374,7 +374,7 @@ void x11_fb_resize(struct fb_window *win
+ void x11_set_standard_properties(struct fb_window *fb_window, char *name)
+ {
+ XSetStandardProperties(fb_window->x11_display,
+- fb_window->x11_fb_window, name, "GXemul "VERSION,
++ fb_window->x11_fb_window, name, "GXemul " VERSION,
+ None, NULL, 0, NULL);
+ }
+
diff -r f7012b445704 -r 82dfec89b601 emulators/gxemul/patches/patch-src_cpus_cpu.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/gxemul/patches/patch-src_cpus_cpu.cc Wed Mar 21 17:39:42 2018 +0000
@@ -0,0 +1,60 @@
+$NetBSD: patch-src_cpus_cpu.cc,v 1.1 2018/03/21 17:39:42 kamil Exp $
+
+Fix C++11 literals.
+
+--- src/cpus/cpu.cc.orig 2014-08-17 08:45:15.000000000 +0000
++++ src/cpus/cpu.cc
+@@ -245,9 +245,9 @@ void cpu_functioncall_trace(struct cpu *
+ fatal("%s", symbol);
+ else {
+ if (cpu->is_32bit)
+- fatal("0x%"PRIx32, (uint32_t) f);
++ fatal("0x%" PRIx32, (uint32_t) f);
+ else
+- fatal("0x%"PRIx64, (uint64_t) f);
++ fatal("0x%" PRIx64, (uint64_t) f);
+ }
+ fatal("(");
+
+@@ -258,7 +258,7 @@ void cpu_functioncall_trace(struct cpu *
+
+ #ifdef PRINT_MEMORY_CHECKSUM
+ /* Temporary hack for finding bugs: */
+- fatal("call chksum=%016"PRIx64"\n", memory_checksum(cpu->mem));
++ fatal("call chksum=%016" PRIx64 "\n", memory_checksum(cpu->mem));
+ #endif
+ }
+
+@@ -425,7 +425,7 @@ void cpu_show_cycles(struct machine *mac
+ if (!machine->show_nr_of_instructions && !forced)
+ goto do_return;
+
+- printf("[ %"PRIi64" instrs", (int64_t) cpu->ninstrs);
++ printf("[ %" PRIi64 " instrs", (int64_t) cpu->ninstrs);
+
+ /* Instructions per second, and average so far: */
+ is = 1000 * (ninstrs-ninstrs_last) / (mseconds-mseconds_last);
+@@ -439,15 +439,15 @@ void cpu_show_cycles(struct machine *mac
+ printf("; idling");
+ cpu->has_been_idling = 0;
+ } else
+- printf("; i/s=%"PRIi64" avg=%"PRIi64, is, avg);
++ printf("; i/s=%" PRIi64 " avg=%" PRIi64, is, avg);
+
+ symbol = get_symbol_name(&machine->symbol_context, pc, &offset);
+
+ if (machine->ncpus == 1) {
+ if (cpu->is_32bit)
+- printf("; pc=0x%08"PRIx32, (uint32_t) pc);
++ printf("; pc=0x%08" PRIx32, (uint32_t) pc);
+ else
+- printf("; pc=0x%016"PRIx64, (uint64_t) pc);
++ printf("; pc=0x%016" PRIx64, (uint64_t) pc);
+ }
+
+ /* Special hack for M88K userland: (Don't show symbols.) */
+@@ -568,4 +568,3 @@ void cpu_init(void)
+ {
+ ADD_ALL_CPU_FAMILIES;
+ }
+-
diff -r f7012b445704 -r 82dfec89b601 emulators/gxemul/patches/patch-src_cpus_cpu__alpha.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/gxemul/patches/patch-src_cpus_cpu__alpha.cc Wed Mar 21 17:39:42 2018 +0000
@@ -0,0 +1,64 @@
+$NetBSD: patch-src_cpus_cpu__alpha.cc,v 1.1 2018/03/21 17:39:42 kamil Exp $
Home |
Main Index |
Thread Index |
Old Index