Hi ports@, Here is a diff to update gxemul to 0.6.0.2.
This allows getting rid of all patches but the configure one. Comments? OK? Index: Makefile =================================================================== RCS file: /cvs/ports/emulators/gxemul/Makefile,v retrieving revision 1.41 diff -u -p -r1.41 Makefile --- Makefile 24 Oct 2018 14:28:01 -0000 1.41 +++ Makefile 5 Nov 2018 09:17:46 -0000 @@ -2,9 +2,8 @@ COMMENT= ARM/M88k/MIPS/PowerPC/SuperH machines emulator -DISTNAME = gxemul-0.6.0.1 +DISTNAME = gxemul-0.6.0.2 CATEGORIES= emulators -REVISION = 5 HOMEPAGE= http://gxemul.sourceforge.net/ Index: distinfo =================================================================== RCS file: /cvs/ports/emulators/gxemul/distinfo,v retrieving revision 1.22 diff -u -p -r1.22 distinfo --- distinfo 12 Oct 2014 13:26:16 -0000 1.22 +++ distinfo 5 Nov 2018 09:17:46 -0000 @@ -1,2 +1,2 @@ -SHA256 (gxemul-0.6.0.1.tar.gz) = B5CCPY1/iEjJgxis6Cn3oBWaX5t52AvYw2f7FwFNzak= -SIZE (gxemul-0.6.0.1.tar.gz) = 5420978 +SHA256 (gxemul-0.6.0.2.tar.gz) = CgzrS13mRjSHsocp1A6OCm526pVTBul6paXHSvrrZjY= +SIZE (gxemul-0.6.0.2.tar.gz) = 5498962 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/emulators/gxemul/patches/patch-configure,v retrieving revision 1.3 diff -u -p -r1.3 patch-configure --- patches/patch-configure 12 Oct 2014 13:26:16 -0000 1.3 +++ patches/patch-configure 5 Nov 2018 09:17:46 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-configure,v 1.3 2014/10/12 13:26:16 bcallah Exp $ ---- configure.orig Sat Oct 11 17:32:31 2014 -+++ configure Sat Oct 11 17:32:49 2014 -@@ -597,19 +597,6 @@ fi +Index: configure +--- configure.orig ++++ configure +@@ -580,19 +580,6 @@ fi rm -f _testprog _testprog.error _testprog.stdout Index: patches/patch-src_components_cpu_CPUDyntransComponent_cc =================================================================== RCS file: patches/patch-src_components_cpu_CPUDyntransComponent_cc diff -N patches/patch-src_components_cpu_CPUDyntransComponent_cc --- patches/patch-src_components_cpu_CPUDyntransComponent_cc 28 Apr 2017 07:37:00 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_components_cpu_CPUDyntransComponent_cc,v 1.1 2017/04/28 07:37:00 fcambus Exp $ ---- src/components/cpu/CPUDyntransComponent.cc.orig Sun Aug 17 10:45:14 2014 -+++ src/components/cpu/CPUDyntransComponent.cc Mon Apr 24 15:28:54 2017 -@@ -194,7 +194,7 @@ void CPUDyntransComponent::DyntransClearICPage(struct - // Fill the page with "to be translated" entries, which when executed - // will read the instruction from memory, attempt to translate it, and - // then execute it. -- void (*f)(CPUDyntransComponent*, DyntransIC*) = GetDyntransToBeTranslated(); -+ DyntransIC_t f = GetDyntransToBeTranslated(); - - for (int i=0; i<m_dyntransICentriesPerPage; ++i) - icpage[i].f = f; Index: patches/patch-src_components_cpu_M88K_CPUComponent_cc =================================================================== RCS file: patches/patch-src_components_cpu_M88K_CPUComponent_cc diff -N patches/patch-src_components_cpu_M88K_CPUComponent_cc --- patches/patch-src_components_cpu_M88K_CPUComponent_cc 28 Apr 2017 07:37:00 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_components_cpu_M88K_CPUComponent_cc,v 1.1 2017/04/28 07:37:00 fcambus Exp $ ---- src/components/cpu/M88K_CPUComponent.cc.orig Sun Aug 17 10:45:14 2014 -+++ src/components/cpu/M88K_CPUComponent.cc Mon Apr 24 15:28:54 2017 -@@ -337,7 +337,7 @@ int M88K_CPUComponent::GetDyntransICshift() const - } - - --void (*M88K_CPUComponent::GetDyntransToBeTranslated())(CPUDyntransComponent*, DyntransIC*) const -+DyntransIC_t M88K_CPUComponent::GetDyntransToBeTranslated() const - { - return instr_ToBeTranslated; - } Index: patches/patch-src_components_cpu_MIPS_CPUComponent_cc =================================================================== RCS file: patches/patch-src_components_cpu_MIPS_CPUComponent_cc diff -N patches/patch-src_components_cpu_MIPS_CPUComponent_cc --- patches/patch-src_components_cpu_MIPS_CPUComponent_cc 28 Apr 2017 07:37:00 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_components_cpu_MIPS_CPUComponent_cc,v 1.1 2017/04/28 07:37:00 fcambus Exp $ ---- src/components/cpu/MIPS_CPUComponent.cc.orig Sun Aug 17 10:45:14 2014 -+++ src/components/cpu/MIPS_CPUComponent.cc Mon Apr 24 15:28:54 2017 -@@ -327,7 +327,7 @@ int MIPS_CPUComponent::GetDyntransICshift() const - } - - --void (*MIPS_CPUComponent::GetDyntransToBeTranslated())(CPUDyntransComponent*, DyntransIC*) const -+DyntransIC_t MIPS_CPUComponent::GetDyntransToBeTranslated() const - { - bool mips16 = m_pc & 1? true : false; - return mips16? instr_ToBeTranslated_MIPS16 : instr_ToBeTranslated; Index: patches/patch-src_console_x11_cc =================================================================== RCS file: patches/patch-src_console_x11_cc diff -N patches/patch-src_console_x11_cc --- patches/patch-src_console_x11_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_console_x11_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/console/x11.cc ---- src/console/x11.cc.orig -+++ src/console/x11.cc -@@ -374,7 +374,7 @@ void x11_fb_resize(struct fb_window *win, int new_xsiz - 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); - } - Index: patches/patch-src_cpus_cpu_alpha_cc =================================================================== RCS file: patches/patch-src_cpus_cpu_alpha_cc diff -N patches/patch-src_cpus_cpu_alpha_cc --- patches/patch-src_cpus_cpu_alpha_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,58 +0,0 @@ -$OpenBSD: patch-src_cpus_cpu_alpha_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/cpu_alpha.cc ---- src/cpus/cpu_alpha.cc.orig -+++ src/cpus/cpu_alpha.cc -@@ -181,14 +181,14 @@ void alpha_cpu_register_dump(struct cpu *cpu, int gprs - if (gprs) { - symbol = get_symbol_name(&cpu->machine->symbol_context, - cpu->pc, &offset); -- debug("cpu%i:\t pc = 0x%016"PRIx64, x, (uint64_t) cpu->pc); -+ debug("cpu%i:\t pc = 0x%016" PRIx64, x, (uint64_t) cpu->pc); - debug(" <%s>\n", symbol != NULL? symbol : " no symbol "); - for (i=0; i<N_ALPHA_REGS; i++) { - int r = (i >> 1) + ((i & 1) << 4); - if ((i % 2) == 0) - debug("cpu%i:\t", x); - if (r != ALPHA_ZERO) -- debug("%3s = 0x%016"PRIx64, alpha_regname[r], -+ debug("%3s = 0x%016" PRIx64, alpha_regname[r], - (uint64_t) cpu->cd.alpha.r[r]); - if ((i % 2) == 1) - debug("\n"); -@@ -283,7 +283,7 @@ int alpha_cpu_disassemble_instr(struct cpu *cpu, unsig - if (cpu->machine->ncpus > 1 && running) - debug("cpu%i:\t", cpu->cpu_id); - -- debug("%016"PRIx64": ", (uint64_t) dumpaddr); -+ debug("%016" PRIx64": ", (uint64_t) dumpaddr); - - iw = ib[0] + (ib[1]<<8) + (ib[2]<<16) + (ib[3]<<24); - debug("%08x\t", (int)iw); -@@ -594,7 +594,7 @@ int alpha_cpu_disassemble_instr(struct cpu *cpu, unsig - debug("jsr"); - debug("\t%s,", alpha_regname[ra]); - debug("(%s),", alpha_regname[rb]); -- debug("0x%"PRIx64, (uint64_t) tmp); -+ debug("0x%" PRIx64, (uint64_t) tmp); - symbol = get_symbol_name(&cpu->machine->symbol_context, - tmp, &offset); - if (symbol != NULL) -@@ -616,7 +616,7 @@ int alpha_cpu_disassemble_instr(struct cpu *cpu, unsig - debug("%s\t", opcode==0x30? "br" : "bsr"); - if (ra != ALPHA_ZERO) - debug("%s,", alpha_regname[ra]); -- debug("0x%"PRIx64, (uint64_t) tmp); -+ debug("0x%" PRIx64, (uint64_t) tmp); - symbol = get_symbol_name(&cpu->machine->symbol_context, - tmp, &offset); - if (symbol != NULL) -@@ -656,7 +656,7 @@ int alpha_cpu_disassemble_instr(struct cpu *cpu, unsig - debug("f%i,", ra); - else - debug("%s,", alpha_regname[ra]); -- debug("0x%"PRIx64, (uint64_t) tmp); -+ debug("0x%" PRIx64, (uint64_t) tmp); - symbol = get_symbol_name(&cpu->machine->symbol_context, - tmp, &offset); - if (symbol != NULL) Index: patches/patch-src_cpus_cpu_alpha_palcode_cc =================================================================== RCS file: patches/patch-src_cpus_cpu_alpha_palcode_cc diff -N patches/patch-src_cpus_cpu_alpha_palcode_cc --- patches/patch-src_cpus_cpu_alpha_palcode_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_cpus_cpu_alpha_palcode_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/cpu_alpha_palcode.cc ---- src/cpus/cpu_alpha_palcode.cc.orig -+++ src/cpus/cpu_alpha_palcode.cc -@@ -90,7 +90,7 @@ void alpha_palcode_name(uint32_t palcode, char *buf, s - case 0xaa: snprintf(buf, buflen, "PAL_gentrap"); break; - case 0xae: snprintf(buf, buflen, "PAL_clrfen"); break; - case 0x3fffffe: snprintf(buf, buflen, "GXemul_PROM"); break; -- default:snprintf(buf, buflen, "UNKNOWN 0x%"PRIx32, palcode); -+ default:snprintf(buf, buflen, "UNKNOWN 0x%" PRIx32, palcode); - } - } - -@@ -144,7 +144,7 @@ void alpha_prom_call(struct cpu *cpu) - store_buf(cpu, a2, s, len); - break; - -- default:fatal("[ Alpha PALcode: GXemul PROM call, a0=0x%"PRIx64" ]\n", -+ default:fatal("[ Alpha PALcode: GXemul PROM call, a0=0x%" PRIx64" ]\n", - (uint64_t) cpu->cd.alpha.r[ALPHA_A0]); - cpu->running = 0; - } Index: patches/patch-src_cpus_cpu_arm_instr_cc =================================================================== RCS file: patches/patch-src_cpus_cpu_arm_instr_cc diff -N patches/patch-src_cpus_cpu_arm_instr_cc --- patches/patch-src_cpus_cpu_arm_instr_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_cpus_cpu_arm_instr_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/cpu_arm_instr.cc ---- src/cpus/cpu_arm_instr.cc.orig -+++ 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); - } Index: patches/patch-src_cpus_cpu_cc =================================================================== RCS file: patches/patch-src_cpus_cpu_cc diff -N patches/patch-src_cpus_cpu_cc --- patches/patch-src_cpus_cpu_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,45 +0,0 @@ -$OpenBSD: patch-src_cpus_cpu_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/cpu.cc ---- src/cpus/cpu.cc.orig -+++ src/cpus/cpu.cc -@@ -245,9 +245,9 @@ void cpu_functioncall_trace(struct cpu *cpu, uint64_t - 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("("); - -@@ -425,7 +425,7 @@ void cpu_show_cycles(struct machine *machine, int forc - 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 *machine, int forc - 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.) */ Index: patches/patch-src_cpus_cpu_dyntrans_cc =================================================================== RCS file: patches/patch-src_cpus_cpu_dyntrans_cc diff -N patches/patch-src_cpus_cpu_dyntrans_cc --- patches/patch-src_cpus_cpu_dyntrans_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,80 +0,0 @@ -$OpenBSD: patch-src_cpus_cpu_dyntrans_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/cpu_dyntrans.cc ---- src/cpus/cpu_dyntrans.cc.orig -+++ src/cpus/cpu_dyntrans.cc -@@ -79,10 +79,10 @@ static void gather_statistics(struct cpu *cpu) - a += low_pc << DYNTRANS_INSTR_ALIGNMENT_SHIFT; - if (cpu->is_32bit) - snprintf(buf + strlen(buf), sizeof(buf), -- "0x%08"PRIx32, (uint32_t)a); -+ "0x%08" PRIx32, (uint32_t)a); - else - snprintf(buf + strlen(buf), sizeof(buf), -- "0x%016"PRIx64, (uint64_t)a); -+ "0x%016" PRIx64, (uint64_t)a); - break; - case 'v': - /* Virtual program counter address: */ -@@ -92,10 +92,10 @@ static void gather_statistics(struct cpu *cpu) - a += low_pc << DYNTRANS_INSTR_ALIGNMENT_SHIFT; - if (cpu->is_32bit) - snprintf(buf + strlen(buf), sizeof(buf), -- "0x%08"PRIx32, (uint32_t)a); -+ "0x%08" PRIx32, (uint32_t)a); - else - snprintf(buf + strlen(buf), sizeof(buf), -- "0x%016"PRIx64, (uint64_t)a); -+ "0x%016" PRIx64, (uint64_t)a); - break; - } - i++; -@@ -533,9 +533,9 @@ void DYNTRANS_FUNCTION_TRACE_DEF(struct cpu *cpu, int - fatal("&%s", symbol); - else { - if (cpu->is_32bit) -- fatal("0x%"PRIx32, (uint32_t)d); -+ fatal("0x%" PRIx32, (uint32_t)d); - else -- fatal("0x%"PRIx64, (uint64_t)d); -+ fatal("0x%" PRIx64, (uint64_t)d); - } - - if (x < n_args_to_print - 1) -@@ -1439,8 +1439,8 @@ void DYNTRANS_UPDATE_TRANSLATION_TABLE(struct cpu *cpu - vaddr_page &= 0xffffffffULL; - - if (paddr_page > 0xffffffffULL) { -- fatal("update_translation_table(): v=0x%016"PRIx64", h=%p w=%i" -- " p=0x%016"PRIx64"\n", vaddr_page, host_page, writeflag, -+ fatal("update_translation_table(): v=0x%016" PRIx64", h=%p w=%i" -+ " p=0x%016" PRIx64"\n", vaddr_page, host_page, writeflag, - paddr_page); - exit(1); - } -@@ -1730,11 +1730,11 @@ cpu->cd.DYNTRANS_ARCH.vph_tlb_entry[r].valid); - quiet_mode = tmp_old_quiet_mode; - } - #ifdef MODE32 -- fatal("BREAKPOINT: pc = 0x%"PRIx32"\n(The " -+ fatal("BREAKPOINT: pc = 0x%" PRIx32"\n(The " - "instruction has not yet executed.)\n", - (uint32_t)cpu->pc); - #else -- fatal("BREAKPOINT: pc = 0x%"PRIx64"\n(The " -+ fatal("BREAKPOINT: pc = 0x%" PRIx64"\n(The " - "instruction has not yet executed.)\n", - (uint64_t)cpu->pc); - #endif -@@ -1894,9 +1894,9 @@ bad: /* - - if (cpu->machine->instruction_trace) { - if (cpu->is_32bit) -- fatal(" at 0x%"PRIx32"\n", (uint32_t)cpu->pc); -+ fatal(" at 0x%" PRIx32"\n", (uint32_t)cpu->pc); - else -- fatal(" at 0x%"PRIx64"\n", (uint64_t)cpu->pc); -+ fatal(" at 0x%" PRIx64"\n", (uint64_t)cpu->pc); - } else { - fatal(":\n"); - DISASSEMBLE(cpu, ib, 1, 0); Index: patches/patch-src_cpus_cpu_m88k_cc =================================================================== RCS file: patches/patch-src_cpus_cpu_m88k_cc diff -N patches/patch-src_cpus_cpu_m88k_cc --- patches/patch-src_cpus_cpu_m88k_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,184 +0,0 @@ -$OpenBSD: patch-src_cpus_cpu_m88k_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/cpu_m88k.cc ---- src/cpus/cpu_m88k.cc.orig -+++ src/cpus/cpu_m88k.cc -@@ -278,7 +278,7 @@ void m88k_cpu_register_dump(struct cpu *cpu, int gprs, - if (gprs) { - symbol = get_symbol_name(&cpu->machine->symbol_context, - cpu->pc, &offset); -- debug("cpu%i: pc = 0x%08"PRIx32, x, (uint32_t)cpu->pc); -+ debug("cpu%i: pc = 0x%08" PRIx32, x, (uint32_t)cpu->pc); - debug(" <%s>\n", symbol != NULL? symbol : " no symbol "); - - for (i=0; i<N_M88K_REGS; i++) { -@@ -287,7 +287,7 @@ void m88k_cpu_register_dump(struct cpu *cpu, int gprs, - if (i == 0) - debug(" "); - else -- debug(" r%-2i = 0x%08"PRIx32, -+ debug(" r%-2i = 0x%08" PRIx32, - i, cpu->cd.m88k.r[i]); - if ((i % 4) == 3) - debug("\n"); -@@ -304,7 +304,7 @@ void m88k_cpu_register_dump(struct cpu *cpu, int gprs, - for (i=0; i<n_control_regs; i++) { - if ((i % 4) == 0) - debug("cpu%i:", x); -- debug(" %4s=0x%08"PRIx32, -+ debug(" %4s=0x%08" PRIx32, - m88k_cr_name(cpu, i), cpu->cd.m88k.cr[i]); - if ((i % 4) == 3) - debug("\n"); -@@ -317,7 +317,7 @@ void m88k_cpu_register_dump(struct cpu *cpu, int gprs, - for (i=0; i<n_fpu_control_regs; i++) { - if ((i % 4) == 0) - debug("cpu%i:", x); -- debug(" %5s=0x%08"PRIx32, -+ debug(" %5s=0x%08" PRIx32, - m88k_fcr_name(cpu, i), cpu->cd.m88k.fcr[i]); - if ((i % 4) == 3) - debug("\n"); -@@ -357,8 +357,8 @@ void m88k_cpu_tlbdump(struct machine *m, int x, int ra - for (i = 0; i < N_M88200_BATC_REGS; i++) { - uint32_t b = cmmu->batc[i]; - printf("cpu%i: BATC[%2i]: ", cpu_nr, i); -- printf("v=0x%08"PRIx32, b & 0xfff80000); -- printf(", p=0x%08"PRIx32, -+ printf("v=0x%08" PRIx32, b & 0xfff80000); -+ printf(", p=0x%08" PRIx32, - (b << 13) & 0xfff80000); - printf(", %s %s %s %s %s %s\n", - b & BATC_SO? "SP " : "!sp", -@@ -379,8 +379,8 @@ void m88k_cpu_tlbdump(struct machine *m, int x, int ra - printf("superv"); - else - printf("user "); -- printf(" v=0x%08"PRIx32, v & 0xfffff000); -- printf(", p=0x%08"PRIx32, p & 0xfffff000); -+ printf(" v=0x%08" PRIx32, v & 0xfffff000); -+ printf(", p=0x%08" PRIx32, p & 0xfffff000); - - printf(" %s %s %s %s %s %s %s", - v & PG_U1? "U1 " : "!u1", -@@ -633,8 +633,8 @@ static void m88k_memory_transaction_debug_dump(struct - } - debug("bytebits=0x%x ]\n", DMT_ENBITS(dmt)); - -- debug("[ DMD%i: 0x%08"PRIx32"; ", n, cpu->cd.m88k.dmd[n]); -- debug("DMA%i: 0x%08"PRIx32" ]\n", n, cpu->cd.m88k.dma[n]); -+ debug("[ DMD%i: 0x%08" PRIx32"; ", n, cpu->cd.m88k.dmd[n]); -+ debug("DMA%i: 0x%08" PRIx32" ]\n", n, cpu->cd.m88k.dma[n]); - } else - debug("not valid ]\n"); - } -@@ -852,7 +852,7 @@ int m88k_cpu_disassemble_instr(struct cpu *cpu, unsign - if (cpu->machine->ncpus > 1 && running) - debug("cpu%i:\t", cpu->cpu_id); - -- debug("%c%08"PRIx32": ", -+ debug("%c%08" PRIx32": ", - cpu->cd.m88k.cr[M88K_CR_PSR] & M88K_PSR_MODE? 's' : 'u', - (uint32_t) dumpaddr); - -@@ -861,7 +861,7 @@ int m88k_cpu_disassemble_instr(struct cpu *cpu, unsign - else - iw = ib[3] + (ib[2]<<8) + (ib[1]<<16) + (ib[0]<<24); - -- debug("%08"PRIx32, (uint32_t) iw); -+ debug("%08" PRIx32, (uint32_t) iw); - - if (running && cpu->delay_slot) - debug(" (d)"); -@@ -914,23 +914,23 @@ int m88k_cpu_disassemble_instr(struct cpu *cpu, unsign - if (symbol != NULL && supervisor) - debug("\t; [<%s>]", symbol); - else -- debug("\t; [0x%08"PRIx32"]", tmpaddr); -+ debug("\t; [0x%08" PRIx32"]", tmpaddr); - if (op26 >= 0x08) { - /* Store: */ - debug(" = "); - switch (op26 & 3) { -- case 0: debug("0x%016"PRIx64, (uint64_t) -+ case 0: debug("0x%016" PRIx64, (uint64_t) - ((((uint64_t) cpu->cd.m88k.r[d]) - << 32) + ((uint64_t) - cpu->cd.m88k.r[d+1])) ); - break; -- case 1: debug("0x%08"PRIx32, -+ case 1: debug("0x%08" PRIx32, - (uint32_t) cpu->cd.m88k.r[d]); - break; -- case 2: debug("0x%04"PRIx16, -+ case 2: debug("0x%04" PRIx16, - (uint16_t) cpu->cd.m88k.r[d]); - break; -- case 3: debug("0x%02"PRIx8, -+ case 3: debug("0x%02" PRIx8, - (uint8_t) cpu->cd.m88k.r[d]); - break; - } -@@ -967,7 +967,7 @@ int m88k_cpu_disassemble_instr(struct cpu *cpu, unsign - if (symbol != NULL && supervisor) - debug("\t; [<%s>]", symbol); - else -- debug("\t; [0x%08"PRIx32"]", tmpaddr); -+ debug("\t; [0x%08" PRIx32"]", tmpaddr); - } - } - debug("\n"); -@@ -1023,7 +1023,7 @@ int m88k_cpu_disassemble_instr(struct cpu *cpu, unsign - if (symbol != NULL && supervisor) - debug("<%s>", symbol); - else -- debug("0x%08"PRIx32, tmpaddr); -+ debug("0x%08" PRIx32, tmpaddr); - } - } - -@@ -1145,7 +1145,7 @@ int m88k_cpu_disassemble_instr(struct cpu *cpu, unsign - debug("b%sr%s\t", - op26 >= 0x32? "s" : "", - op26 & 1? ".n" : ""); -- debug("0x%08"PRIx32, (uint32_t) (dumpaddr + d26)); -+ debug("0x%08" PRIx32, (uint32_t) (dumpaddr + d26)); - symbol = get_symbol_name(&cpu->machine->symbol_context, - dumpaddr + d26, &offset); - if (symbol != NULL && supervisor) -@@ -1184,7 +1184,7 @@ int m88k_cpu_disassemble_instr(struct cpu *cpu, unsign - } else { - debug("%i", d); - } -- debug(",r%i,0x%08"PRIx32, s1, (uint32_t) (dumpaddr + d16)); -+ debug(",r%i,0x%08" PRIx32, s1, (uint32_t) (dumpaddr + d16)); - symbol = get_symbol_name(&cpu->machine->symbol_context, - dumpaddr + d16, &offset); - if (symbol != NULL && supervisor) -@@ -1225,7 +1225,7 @@ int m88k_cpu_disassemble_instr(struct cpu *cpu, unsign - if (symbol != NULL && supervisor) - debug("\t; [<%s>]", symbol); - else -- debug("\t; [0x%08"PRIx32"]", tmpaddr); -+ debug("\t; [0x%08" PRIx32"]", tmpaddr); - } - - debug("\n"); -@@ -1314,7 +1314,7 @@ int m88k_cpu_disassemble_instr(struct cpu *cpu, unsign - if (symbol != NULL && supervisor) - debug("\t; [<%s>]", symbol); - else -- debug("\t; [0x%08"PRIx32"]", tmpaddr); -+ debug("\t; [0x%08" PRIx32"]", tmpaddr); - } - - debug("\n"); -@@ -1410,7 +1410,7 @@ int m88k_cpu_disassemble_instr(struct cpu *cpu, unsign - if (symbol != NULL && supervisor) - debug("<%s>", symbol); - else -- debug("0x%08"PRIx32, tmpaddr); -+ debug("0x%08" PRIx32, tmpaddr); - } - debug("\n"); - break; Index: patches/patch-src_cpus_cpu_m88k_instr_cc =================================================================== RCS file: patches/patch-src_cpus_cpu_m88k_instr_cc diff -N patches/patch-src_cpus_cpu_m88k_instr_cc --- patches/patch-src_cpus_cpu_m88k_instr_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_cpus_cpu_m88k_instr_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/cpu_m88k_instr.cc ---- src/cpus/cpu_m88k_instr.cc.orig -+++ src/cpus/cpu_m88k_instr.cc -@@ -1522,7 +1522,7 @@ X(rte) - return; - - abort_dump: -- fatal("RTE failed. NIP=0x%08"PRIx32", FIP=0x%08"PRIx32"\n", -+ fatal("RTE failed. NIP=0x%08" PRIx32", FIP=0x%08" PRIx32"\n", - cpu->cd.m88k.cr[M88K_CR_SNIP], cpu->cd.m88k.cr[M88K_CR_SFIP]); - - ABORT_EXECUTION; -@@ -2699,7 +2699,7 @@ X(to_be_translated) - if (iword == 0xf400fc00) - ic->f = instr(rte); - else { -- fatal("unimplemented rte variant: 0x%08"PRIx32"\n", iword); -+ fatal("unimplemented rte variant: 0x%08" PRIx32"\n", iword); - goto bad; - } - break; Index: patches/patch-src_cpus_cpu_m88k_instr_loadstore_cc =================================================================== RCS file: patches/patch-src_cpus_cpu_m88k_instr_loadstore_cc diff -N patches/patch-src_cpus_cpu_m88k_instr_loadstore_cc --- patches/patch-src_cpus_cpu_m88k_instr_loadstore_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_cpus_cpu_m88k_instr_loadstore_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/cpu_m88k_instr_loadstore.cc ---- src/cpus/cpu_m88k_instr_loadstore.cc.orig -+++ src/cpus/cpu_m88k_instr_loadstore.cc -@@ -161,7 +161,7 @@ void LS_GENERIC_N(struct cpu *cpu, struct m88k_instr_c - m88k_exception(cpu, M88K_EXCEPTION_MISALIGNED_ACCESS, 0); - #else - fatal("{ m88k dyntrans alignment exception, size = %i," -- " addr = %08"PRIx32", pc = %08"PRIx32" }\n", LS_SIZE, -+ " addr = %08" PRIx32", pc = %08" PRIx32" }\n", LS_SIZE, - (uint32_t) addr, (uint32_t) cpu->pc); - - /* TODO: Generalize this into a abort_call, or similar: */ Index: patches/patch-src_cpus_cpu_mips_cc =================================================================== RCS file: patches/patch-src_cpus_cpu_mips_cc diff -N patches/patch-src_cpus_cpu_mips_cc --- patches/patch-src_cpus_cpu_mips_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,316 +0,0 @@ -$OpenBSD: patch-src_cpus_cpu_mips_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/cpu_mips.cc ---- src/cpus/cpu_mips.cc.orig -+++ src/cpus/cpu_mips.cc -@@ -514,13 +514,13 @@ void mips_cpu_tlbdump(struct machine *m, int x, int ra - (int) cop0->reg[COP0_INDEX], - (int) cop0->reg[COP0_RANDOM]); - else -- printf("index=0x%016"PRIx64 -- " random=0x%016"PRIx64, -+ printf("index=0x%016" PRIx64 -+ " random=0x%016" PRIx64, - (uint64_t) cop0->reg[COP0_INDEX], - (uint64_t) cop0->reg[COP0_RANDOM]); - - if (m->cpus[i]->cd.mips.cpu_type.isa_level >= 3) -- printf(" wired=0x%"PRIx64, -+ printf(" wired=0x%" PRIx64, - (uint64_t) cop0->reg[COP0_WIRED]); - - printf(")\n"); -@@ -529,22 +529,22 @@ void mips_cpu_tlbdump(struct machine *m, int x, int ra - nr_of_tlb_entries; j++) { - if (m->cpus[i]->cd.mips.cpu_type.mmu_model == - MMU3K) -- printf("%3i: hi=0x%08"PRIx32" lo=0x%08" -+ printf("%3i: hi=0x%08" PRIx32" lo=0x%08" - PRIx32"\n", j, - (uint32_t) cop0->tlbs[j].hi, - (uint32_t) cop0->tlbs[j].lo0); - else if (m->cpus[i]->is_32bit) -- printf("%3i: hi=0x%08"PRIx32" mask=0x" -- "%08"PRIx32" lo0=0x%08"PRIx32 -- " lo1=0x%08"PRIx32"\n", j, -+ printf("%3i: hi=0x%08" PRIx32" mask=0x" -+ "%08" PRIx32" lo0=0x%08" PRIx32 -+ " lo1=0x%08" PRIx32"\n", j, - (uint32_t) cop0->tlbs[j].hi, - (uint32_t) cop0->tlbs[j].mask, - (uint32_t) cop0->tlbs[j].lo0, - (uint32_t) cop0->tlbs[j].lo1); - else -- printf("%3i: hi=0x%016"PRIx64" mask=" -- "0x%016"PRIx64" lo0=0x%016"PRIx64 -- " lo1=0x%016"PRIx64"\n", j, -+ printf("%3i: hi=0x%016" PRIx64" mask=" -+ "0x%016" PRIx64" lo0=0x%016" PRIx64 -+ " lo1=0x%016" PRIx64"\n", j, - (uint64_t) cop0->tlbs[j].hi, - (uint64_t) cop0->tlbs[j].mask, - (uint64_t) cop0->tlbs[j].lo0, -@@ -579,7 +579,7 @@ void mips_cpu_tlbdump(struct machine *m, int x, int ra - default:printf("index=0x%x random=0x%x", - (int) (cop0->reg[COP0_INDEX] & INDEX_MASK), - (int) (cop0->reg[COP0_RANDOM] & RANDOM_MASK)); -- printf(" wired=0x%"PRIx64, -+ printf(" wired=0x%" PRIx64, - (uint64_t) cop0->reg[COP0_WIRED]); - } - -@@ -622,11 +622,11 @@ void mips_cpu_tlbdump(struct machine *m, int x, int ra - break; - default:switch (m->cpus[i]->cd.mips.cpu_type.mmu_model){ - case MMU32: -- printf("vaddr=0x%08"PRIx32" ", -+ printf("vaddr=0x%08" PRIx32" ", - (uint32_t) (hi & ~mask)); - break; - default:/* R4x00, R1x000, MIPS64, etc. */ -- printf("vaddr=%016"PRIx64" ", -+ printf("vaddr=%016" PRIx64" ", - (uint64_t) (hi & ~mask)); - } - if (hi & TLB_G) -@@ -644,7 +644,7 @@ void mips_cpu_tlbdump(struct machine *m, int x, int ra - paddr >>= ENTRYLO_PFN_SHIFT; - paddr <<= pageshift; - paddr &= ~(mask >> 1); -- printf(" p0=0x%09"PRIx64" ", -+ printf(" p0=0x%09" PRIx64" ", - (uint64_t) paddr); - } - printf(lo0 & ENTRYLO_D? "D" : " "); -@@ -656,7 +656,7 @@ void mips_cpu_tlbdump(struct machine *m, int x, int ra - paddr >>= ENTRYLO_PFN_SHIFT; - paddr <<= pageshift; - paddr &= ~(mask >> 1); -- printf(" p1=0x%09"PRIx64" ", -+ printf(" p1=0x%09" PRIx64" ", - (uint64_t) paddr); - } - printf(lo1 & ENTRYLO_D? "D" : " "); -@@ -718,9 +718,9 @@ int mips_cpu_disassemble_instr(struct cpu *cpu, unsign - debug("cpu%i: ", cpu->cpu_id); - - if (cpu->is_32bit) -- debug("%08"PRIx32, (uint32_t)dumpaddr); -+ debug("%08" PRIx32, (uint32_t)dumpaddr); - else -- debug("%016"PRIx64, (uint64_t)dumpaddr); -+ debug("%016" PRIx64, (uint64_t)dumpaddr); - - memcpy(instr, originstr, sizeof(uint32_t)); - -@@ -1008,9 +1008,9 @@ int mips_cpu_disassemble_instr(struct cpu *cpu, unsign - } - - if (cpu->is_32bit) -- debug("0x%08"PRIx32, (uint32_t)addr); -+ debug("0x%08" PRIx32, (uint32_t)addr); - else -- debug("0x%016"PRIx64, (uint64_t)addr); -+ debug("0x%016" PRIx64, (uint64_t)addr); - - symbol = get_symbol_name(&cpu->machine->symbol_context, - addr, &offset); -@@ -1187,7 +1187,7 @@ int mips_cpu_disassemble_instr(struct cpu *cpu, unsign - rt, imm, regnames[rs]); - - if (running) { -- debug("\t[0x%016"PRIx64" = %s]", -+ debug("\t[0x%016" PRIx64" = %s]", - (uint64_t)(cpu->cd.mips.gpr[rs] + imm)); - if (symbol != NULL) - debug(" = %s", symbol); -@@ -1212,10 +1212,10 @@ int mips_cpu_disassemble_instr(struct cpu *cpu, unsign - debug("\t["); - - if (cpu->is_32bit) -- debug("0x%08"PRIx32, -+ debug("0x%08" PRIx32, - (uint32_t) (cpu->cd.mips.gpr[rs] + imm)); - else -- debug("0x%016"PRIx64, -+ debug("0x%016" PRIx64, - (uint64_t) (cpu->cd.mips.gpr[rs] + imm)); - - if (symbol != NULL) -@@ -1239,9 +1239,9 @@ int mips_cpu_disassemble_instr(struct cpu *cpu, unsign - addr, &offset); - debug("%s\t0x", hi6_names[hi6]); - if (cpu->is_32bit) -- debug("%08"PRIx32, (uint32_t) addr); -+ debug("%08" PRIx32, (uint32_t) addr); - else -- debug("%016"PRIx64, (uint64_t) addr); -+ debug("%016" PRIx64, (uint64_t) addr); - if (symbol != NULL) - debug("\t<%s>", symbol); - break; -@@ -1281,7 +1281,7 @@ int mips_cpu_disassemble_instr(struct cpu *cpu, unsign - if (cache_op==6) debug("hit writeback"); - if (cache_op==7) debug("hit set virtual"); - if (running) -- debug(", addr 0x%016"PRIx64, -+ debug(", addr 0x%016" PRIx64, - (uint64_t)(cpu->cd.mips.gpr[rt] + imm)); - if (showtag) - debug(", taghi=%08lx lo=%08lx", -@@ -1462,9 +1462,9 @@ int mips_cpu_disassemble_instr(struct cpu *cpu, unsign - addr = (dumpaddr + 4) + (imm << 2); - - if (cpu->is_32bit) -- debug("0x%08"PRIx32, (uint32_t) addr); -+ debug("0x%08" PRIx32, (uint32_t) addr); - else -- debug("0x%016"PRIx64, (uint64_t) addr); -+ debug("0x%016" PRIx64, (uint64_t) addr); - break; - - case REGIMM_SYNCI: -@@ -1509,29 +1509,29 @@ void mips_cpu_register_dump(struct cpu *cpu, int gprs, - cpu->pc, &offset); - - if (bits32) -- debug("cpu%i: pc = %08"PRIx32, -+ debug("cpu%i: pc = %08" PRIx32, - cpu->cpu_id, (uint32_t) cpu->pc); - else if (bits128) -- debug("cpu%i: pc=%016"PRIx64, -+ debug("cpu%i: pc=%016" PRIx64, - cpu->cpu_id, (uint64_t) cpu->pc); - else -- debug("cpu%i: pc = 0x%016"PRIx64, -+ debug("cpu%i: pc = 0x%016" PRIx64, - cpu->cpu_id, (uint64_t) cpu->pc); - - debug(" <%s>\n", symbol != NULL? symbol : - " no symbol "); - - if (bits32) -- debug("cpu%i: hi = %08"PRIx32" lo = %08"PRIx32"\n", -+ debug("cpu%i: hi = %08" PRIx32" lo = %08" PRIx32"\n", - cpu->cpu_id, (uint32_t) cpu->cd.mips.hi, - (uint32_t) cpu->cd.mips.lo); - else if (bits128) { -- debug("cpu%i: hi=%016"PRIx64"%016"PRIx64" lo=" -- "%016"PRIx64"%016"PRIx64"\n", cpu->cpu_id, -+ debug("cpu%i: hi=%016" PRIx64"%016" PRIx64" lo=" -+ "%016" PRIx64"%016" PRIx64"\n", cpu->cpu_id, - cpu->cd.mips.hi1, cpu->cd.mips.hi, - cpu->cd.mips.lo1, cpu->cd.mips.lo); - } else { -- debug("cpu%i: hi = 0x%016"PRIx64" lo = 0x%016" -+ debug("cpu%i: hi = 0x%016" PRIx64" lo = 0x%016" - PRIx64"\n", cpu->cpu_id, - (uint64_t) cpu->cd.mips.hi, - (uint64_t) cpu->cd.mips.lo); -@@ -1548,7 +1548,7 @@ void mips_cpu_register_dump(struct cpu *cpu, int gprs, - debug(" " - " "); - else -- debug(" %3s=%016"PRIx64"%016"PRIx64, -+ debug(" %3s=%016" PRIx64"%016" PRIx64, - regnames[r], (uint64_t) - cpu->cd.mips.gpr_quadhi[r], - (uint64_t)cpu->cd.mips.gpr[r]); -@@ -1563,7 +1563,7 @@ void mips_cpu_register_dump(struct cpu *cpu, int gprs, - if (i == MIPS_GPR_ZERO) - debug(" "); - else -- debug(" %3s = %08"PRIx32, regnames[i], -+ debug(" %3s = %08" PRIx32, regnames[i], - (uint32_t)cpu->cd.mips.gpr[i]); - if ((i & 3) == 3) - debug("\n"); -@@ -1577,7 +1577,7 @@ void mips_cpu_register_dump(struct cpu *cpu, int gprs, - if (r == MIPS_GPR_ZERO) - debug(" "); - else -- debug(" %3s = 0x%016"PRIx64, -+ debug(" %3s = 0x%016" PRIx64, - regnames[r], - (uint64_t)cpu->cd.mips.gpr[r]); - if ((i & 1) == 1) -@@ -1622,7 +1622,7 @@ void mips_cpu_register_dump(struct cpu *cpu, int gprs, - (int) cpu->cd.mips.coproc[ - coprocnr]->reg[i]); - else -- debug(" = 0x%016"PRIx64, (uint64_t) -+ debug(" = 0x%016" PRIx64, (uint64_t) - cpu->cd.mips.coproc[ - coprocnr]->reg[i]); - } -@@ -1640,10 +1640,10 @@ void mips_cpu_register_dump(struct cpu *cpu, int gprs, - debug("cpu%i: ", cpu->cpu_id); - debug("config_select1 = 0x"); - if (cpu->is_32bit) -- debug("%08"PRIx32, -+ debug("%08" PRIx32, - (uint32_t)cpu->cd.mips.cop0_config_select1); - else -- debug("%016"PRIx64, -+ debug("%016" PRIx64, - (uint64_t)cpu->cd.mips.cop0_config_select1); - debug("\n"); - } -@@ -1673,7 +1673,7 @@ void mips_cpu_register_dump(struct cpu *cpu, int gprs, - - if (cpu->cd.mips.rmw) { - printf("cpu%i: Read-Modify-Write in progress, address " -- "0x%016"PRIx64"\n", cpu->cpu_id, cpu->cd.mips.rmw_addr); -+ "0x%016" PRIx64"\n", cpu->cpu_id, cpu->cd.mips.rmw_addr); - } - } - -@@ -1764,10 +1764,10 @@ void mips_cpu_exception(struct cpu *cpu, int exccode, - d, strbuf, sizeof(strbuf))); - } else { - if (cpu->is_32bit) -- debug(" a%i=0x%"PRIx32, x, -+ debug(" a%i=0x%" PRIx32, x, - (uint32_t)d); - else -- debug(" a%i=0x%"PRIx64, x, -+ debug(" a%i=0x%" PRIx64, x, - (uint64_t)d); - } - } -@@ -1781,13 +1781,13 @@ void mips_cpu_exception(struct cpu *cpu, int exccode, - if (cpu->is_32bit) - debug(" vaddr=0x%08x", (int)vaddr); - else -- debug(" vaddr=0x%016"PRIx64, (uint64_t)vaddr); -+ debug(" vaddr=0x%016" PRIx64, (uint64_t)vaddr); - } - - if (cpu->is_32bit) -- debug(" pc=0x%08"PRIx32" ", (uint32_t)cpu->pc); -+ debug(" pc=0x%08" PRIx32" ", (uint32_t)cpu->pc); - else -- debug(" pc=0x%016"PRIx64" ", (uint64_t)cpu->pc); -+ debug(" pc=0x%016" PRIx64" ", (uint64_t)cpu->pc); - - if (symbol != NULL) - debug("<%s> ]\n", symbol); -@@ -1804,14 +1804,14 @@ void mips_cpu_exception(struct cpu *cpu, int exccode, - fatal("cpu%i: ", cpu->cpu_id); - fatal("warning: LOW reference: vaddr="); - if (cpu->is_32bit) -- fatal("0x%08"PRIx32, (uint32_t) vaddr); -+ fatal("0x%08" PRIx32, (uint32_t) vaddr); - else -- fatal("0x%016"PRIx64, (uint64_t) vaddr); -+ fatal("0x%016" PRIx64, (uint64_t) vaddr); - fatal(", exception %s, pc=", exception_names[exccode]); - if (cpu->is_32bit) -- fatal("0x%08"PRIx32, (uint32_t) cpu->pc); -+ fatal("0x%08" PRIx32, (uint32_t) cpu->pc); - else -- fatal("0x%016"PRIx64, (uint64_t)cpu->pc); -+ fatal("0x%016" PRIx64, (uint64_t)cpu->pc); - fatal(" <%s> ]\n", symbol? symbol : "(no symbol)"); - } - Index: patches/patch-src_cpus_cpu_mips_coproc_cc =================================================================== RCS file: patches/patch-src_cpus_cpu_mips_coproc_cc diff -N patches/patch-src_cpus_cpu_mips_coproc_cc --- patches/patch-src_cpus_cpu_mips_coproc_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_cpus_cpu_mips_coproc_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/cpu_mips_coproc.cc ---- src/cpus/cpu_mips_coproc.cc.orig -+++ src/cpus/cpu_mips_coproc.cc -@@ -2225,8 +2225,8 @@ void coproc_function(struct cpu *cpu, struct mips_copr - 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); Index: patches/patch-src_cpus_cpu_mips_instr_cc =================================================================== RCS file: patches/patch-src_cpus_cpu_mips_instr_cc diff -N patches/patch-src_cpus_cpu_mips_instr_cc --- patches/patch-src_cpus_cpu_mips_instr_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_cpus_cpu_mips_instr_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/cpu_mips_instr.cc ---- src/cpus/cpu_mips_instr.cc.orig -+++ src/cpus/cpu_mips_instr.cc -@@ -3983,7 +3983,7 @@ X(to_be_translated) - if (cpu->delay_slot) { - if (!cpu->translation_readahead) - fatal("TODO: branch in delay slot (=%i)? (3);" -- " addr=%016"PRIx64" iword=%08"PRIx32"\n", -+ " addr=%016" PRIx64" iword=%08" PRIx32"\n", - cpu->delay_slot, (uint64_t)addr, iword); - goto bad; - } -@@ -4753,7 +4753,7 @@ X(to_be_translated) - if (!has_warned && !cpu->translation_readahead) { - fatal("[ WARNING/NOTE: attempt to execute a 64-bit" - " instruction on an emulated 32-bit processor; " -- "pc=0x%08"PRIx32" ]\n", (uint32_t)cpu->pc); -+ "pc=0x%08" PRIx32" ]\n", (uint32_t)cpu->pc); - has_warned = 1; - } - if (cpu->translation_readahead) Index: patches/patch-src_cpus_cpu_ppc_cc =================================================================== RCS file: patches/patch-src_cpus_cpu_ppc_cc diff -N patches/patch-src_cpus_cpu_ppc_cc --- patches/patch-src_cpus_cpu_ppc_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,289 +0,0 @@ -$OpenBSD: patch-src_cpus_cpu_ppc_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/cpu_ppc.cc ---- src/cpus/cpu_ppc.cc.orig -+++ src/cpus/cpu_ppc.cc -@@ -361,7 +361,7 @@ void ppc_exception(struct cpu *cpu, int exception_nr) - cpu->cd.ppc.spr[SPR_SRR1] = (cpu->cd.ppc.msr & 0x87c0ffff); - - if (!quiet_mode) -- fatal("[ PPC Exception 0x%x; pc=0x%"PRIx64" ]\n", -+ fatal("[ PPC Exception 0x%x; pc=0x%" PRIx64" ]\n", - exception_nr, cpu->pc); - - /* Disable External Interrupts, Recoverable Interrupt Mode, -@@ -401,17 +401,17 @@ void ppc_cpu_register_dump(struct cpu *cpu, int gprs, - - debug("cpu%i: pc = 0x", x); - if (bits32) -- debug("%08"PRIx32, (uint32_t)cpu->pc); -+ debug("%08" PRIx32, (uint32_t)cpu->pc); - else -- debug("%016"PRIx64, (uint64_t)cpu->pc); -+ debug("%016" PRIx64, (uint64_t)cpu->pc); - debug(" <%s>\n", symbol != NULL? symbol : " no symbol "); - - debug("cpu%i: lr = 0x", x); - if (bits32) -- debug("%08"PRIx32, (uint32_t)cpu->cd.ppc.spr[SPR_LR]); -+ debug("%08" PRIx32, (uint32_t)cpu->cd.ppc.spr[SPR_LR]); - else -- debug("%016"PRIx64, (uint64_t)cpu->cd.ppc.spr[SPR_LR]); -- debug(" cr = 0x%08"PRIx32, (uint32_t)cpu->cd.ppc.cr); -+ debug("%016" PRIx64, (uint64_t)cpu->cd.ppc.spr[SPR_LR]); -+ debug(" cr = 0x%08" PRIx32, (uint32_t)cpu->cd.ppc.cr); - - if (bits32) - debug(" "); -@@ -419,15 +419,15 @@ void ppc_cpu_register_dump(struct cpu *cpu, int gprs, - debug("\ncpu%i: ", x); - debug("ctr = 0x", x); - if (bits32) -- debug("%08"PRIx32, (uint32_t)cpu->cd.ppc.spr[SPR_CTR]); -+ debug("%08" PRIx32, (uint32_t)cpu->cd.ppc.spr[SPR_CTR]); - else -- debug("%016"PRIx64, (uint64_t)cpu->cd.ppc.spr[SPR_CTR]); -+ debug("%016" PRIx64, (uint64_t)cpu->cd.ppc.spr[SPR_CTR]); - - debug(" xer = 0x", x); - if (bits32) -- debug("%08"PRIx32, (uint32_t)cpu->cd.ppc.spr[SPR_XER]); -+ debug("%08" PRIx32, (uint32_t)cpu->cd.ppc.spr[SPR_XER]); - else -- debug("%016"PRIx64, (uint64_t)cpu->cd.ppc.spr[SPR_XER]); -+ debug("%016" PRIx64, (uint64_t)cpu->cd.ppc.spr[SPR_XER]); - - debug("\n"); - -@@ -436,7 +436,7 @@ void ppc_cpu_register_dump(struct cpu *cpu, int gprs, - for (i=0; i<PPC_NGPRS; i++) { - if ((i % 4) == 0) - debug("cpu%i:", x); -- debug(" r%02i = 0x%08"PRIx32" ", i, -+ debug(" r%02i = 0x%08" PRIx32" ", i, - (uint32_t) cpu->cd.ppc.gpr[i]); - if ((i % 4) == 3) - debug("\n"); -@@ -447,7 +447,7 @@ void ppc_cpu_register_dump(struct cpu *cpu, int gprs, - int r = (i >> 1) + ((i & 1) << 4); - if ((i % 2) == 0) - debug("cpu%i:", x); -- debug(" r%02i = 0x%016"PRIx64" ", r, -+ debug(" r%02i = 0x%016" PRIx64" ", r, - (uint64_t) cpu->cd.ppc.gpr[r]); - if ((i % 2) == 1) - debug("\n"); -@@ -456,13 +456,13 @@ void ppc_cpu_register_dump(struct cpu *cpu, int gprs, - - /* Other special registers: */ - if (bits32) { -- debug("cpu%i: srr0 = 0x%08"PRIx32 -- " srr1 = 0x%08"PRIx32"\n", x, -+ debug("cpu%i: srr0 = 0x%08" PRIx32 -+ " srr1 = 0x%08" PRIx32"\n", x, - (uint32_t) cpu->cd.ppc.spr[SPR_SRR0], - (uint32_t) cpu->cd.ppc.spr[SPR_SRR1]); - } else { -- debug("cpu%i: srr0 = 0x%016"PRIx64 -- " srr1 = 0x%016"PRIx64"\n", x, -+ debug("cpu%i: srr0 = 0x%016" PRIx64 -+ " srr1 = 0x%016" PRIx64"\n", x, - (uint64_t) cpu->cd.ppc.spr[SPR_SRR0], - (uint64_t) cpu->cd.ppc.spr[SPR_SRR1]); - } -@@ -470,25 +470,25 @@ void ppc_cpu_register_dump(struct cpu *cpu, int gprs, - debug("cpu%i: msr = ", x); - reg_access_msr(cpu, &tmp, 0, 0); - if (bits32) -- debug("0x%08"PRIx32, (uint32_t) tmp); -+ debug("0x%08" PRIx32, (uint32_t) tmp); - else -- debug("0x%016"PRIx64, (uint64_t) tmp); -+ debug("0x%016" PRIx64, (uint64_t) tmp); - -- debug(" tb = 0x%08"PRIx32"%08"PRIx32"\n", -+ debug(" tb = 0x%08" PRIx32"%08" PRIx32"\n", - (uint32_t) cpu->cd.ppc.spr[SPR_TBU], - (uint32_t) cpu->cd.ppc.spr[SPR_TBL]); - -- debug("cpu%i: dec = 0x%08"PRIx32, -+ debug("cpu%i: dec = 0x%08" PRIx32, - x, (uint32_t) cpu->cd.ppc.spr[SPR_DEC]); - if (!bits32) -- debug(" hdec = 0x%08"PRIx32"\n", -+ debug(" hdec = 0x%08" PRIx32"\n", - (uint32_t) cpu->cd.ppc.spr[SPR_HDEC]); - - debug("\n"); - } - - if (coprocs & 1) { -- debug("cpu%i: fpscr = 0x%08"PRIx32"\n", -+ debug("cpu%i: fpscr = 0x%08" PRIx32"\n", - x, (uint32_t) cpu->cd.ppc.fpscr); - - /* TODO: show floating-point values :-) */ -@@ -498,7 +498,7 @@ void ppc_cpu_register_dump(struct cpu *cpu, int gprs, - for (i=0; i<PPC_NFPRS; i++) { - if ((i % 2) == 0) - debug("cpu%i:", x); -- debug(" f%02i = 0x%016"PRIx64" ", i, -+ debug(" f%02i = 0x%016" PRIx64" ", i, - (uint64_t) cpu->cd.ppc.fpr[i]); - if ((i % 2) == 1) - debug("\n"); -@@ -506,7 +506,7 @@ void ppc_cpu_register_dump(struct cpu *cpu, int gprs, - } - - if (coprocs & 2) { -- debug("cpu%i: sdr1 = 0x%"PRIx64"\n", x, -+ debug("cpu%i: sdr1 = 0x%" PRIx64"\n", x, - (uint64_t) cpu->cd.ppc.spr[SPR_SDR1]); - if (cpu->cd.ppc.cpu_type.flags & PPC_601) - debug("cpu%i: PPC601-style, TODO!\n"); -@@ -517,8 +517,8 @@ void ppc_cpu_register_dump(struct cpu *cpu, int gprs, - uint32_t lower = cpu->cd.ppc.spr[spr+1]; - uint32_t len = (((upper & BAT_BL) << 15) - | 0x1ffff) + 1; -- debug("cpu%i: %sbat%i: u=0x%08"PRIx32 -- " l=0x%08"PRIx32" ", -+ debug("cpu%i: %sbat%i: u=0x%08" PRIx32 -+ " l=0x%08" PRIx32" ", - x, i<4? "i" : "d", i&3, upper, lower); - if (!(upper & BAT_V)) { - debug(" (not valid)\n"); -@@ -555,7 +555,7 @@ void ppc_cpu_register_dump(struct cpu *cpu, int gprs, - uint32_t s = cpu->cd.ppc.sr[i]; - - debug("cpu%i:", x); -- debug(" sr%-2i = 0x%08"PRIx32, i, s); -+ debug(" sr%-2i = 0x%08" PRIx32, i, s); - - s &= (SR_TYPE | SR_SUKEY | SR_PRKEY | SR_NOEXEC); - if (s != 0) { -@@ -653,15 +653,15 @@ int ppc_cpu_disassemble_instr(struct cpu *cpu, unsigne - debug("cpu%i: ", cpu->cpu_id); - - if (cpu->cd.ppc.bits == 32) -- debug("%08"PRIx32, (uint32_t) dumpaddr); -+ debug("%08" PRIx32, (uint32_t) dumpaddr); - else -- debug("%016"PRIx64, (uint64_t) dumpaddr); -+ debug("%016" PRIx64, (uint64_t) dumpaddr); - - /* NOTE: Fixed to big-endian. */ - iword = (instr[0] << 24) + (instr[1] << 16) + (instr[2] << 8) - + instr[3]; - -- debug(": %08"PRIx32"\t", iword); -+ debug(": %08" PRIx32"\t", iword); - - /* - * Decode the instruction: -@@ -762,9 +762,9 @@ int ppc_cpu_disassemble_instr(struct cpu *cpu, unsigne - if (cpu->cd.ppc.bits == 32) - addr &= 0xffffffff; - if (cpu->cd.ppc.bits == 32) -- debug("0x%"PRIx32, (uint32_t) addr); -+ debug("0x%" PRIx32, (uint32_t) addr); - else -- debug("0x%"PRIx64, (uint64_t) addr); -+ debug("0x%" PRIx64, (uint64_t) addr); - symbol = get_symbol_name(&cpu->machine->symbol_context, - addr, &offset); - if (symbol != NULL) -@@ -795,9 +795,9 @@ int ppc_cpu_disassemble_instr(struct cpu *cpu, unsigne - if (cpu->cd.ppc.bits == 32) - addr &= 0xffffffff; - if (cpu->cd.ppc.bits == 32) -- debug("\t0x%"PRIx32, (uint32_t) addr); -+ debug("\t0x%" PRIx32, (uint32_t) addr); - else -- debug("\t0x%"PRIx64, (uint64_t) addr); -+ debug("\t0x%" PRIx64, (uint64_t) addr); - symbol = get_symbol_name(&cpu->machine->symbol_context, - addr, &offset); - if (symbol != NULL) -@@ -1086,7 +1086,7 @@ int ppc_cpu_disassemble_instr(struct cpu *cpu, unsigne - if (symbol != NULL) - debug(" \t<%s", symbol); - else -- debug(" \t<0x%"PRIx64, (uint64_t) addr); -+ debug(" \t<0x%" PRIx64, (uint64_t) addr); - if (wlen > 0 && !fpreg /* && !reverse */) { - /* TODO */ - } -@@ -1257,10 +1257,10 @@ int ppc_cpu_disassemble_instr(struct cpu *cpu, unsigne - ppc_spr_names[spr]==NULL? "?" : ppc_spr_names[spr]); - if (running) { - if (cpu->cd.ppc.bits == 32) -- debug(": 0x%"PRIx32, (uint32_t) -+ debug(": 0x%" PRIx32, (uint32_t) - cpu->cd.ppc.spr[spr]); - else -- debug(": 0x%"PRIx64, (uint64_t) -+ debug(": 0x%" PRIx64, (uint64_t) - cpu->cd.ppc.spr[spr]); - } - debug(">"); -@@ -1417,10 +1417,10 @@ int ppc_cpu_disassemble_instr(struct cpu *cpu, unsigne - ppc_spr_names[spr]==NULL? "?" : ppc_spr_names[spr]); - if (running) { - if (cpu->cd.ppc.bits == 32) -- debug(": 0x%"PRIx32, (uint32_t) -+ debug(": 0x%" PRIx32, (uint32_t) - cpu->cd.ppc.gpr[rs]); - else -- debug(": 0x%"PRIx64, (uint64_t) -+ debug(": 0x%" PRIx64, (uint64_t) - cpu->cd.ppc.gpr[rs]); - } - debug(">"); -@@ -1573,7 +1573,7 @@ int ppc_cpu_disassemble_instr(struct cpu *cpu, unsigne - if (symbol != NULL) - debug(" \t<%s", symbol); - else -- debug(" \t<0x%"PRIx64, (uint64_t) addr); -+ debug(" \t<0x%" PRIx64, (uint64_t) addr); - if (wlen > 0 && load && wlen > 0) { - unsigned char tw[8]; - uint64_t tdata = 0; -@@ -1597,12 +1597,12 @@ int ppc_cpu_disassemble_instr(struct cpu *cpu, unsigne - if (symbol != NULL) - debug("%s", symbol); - else -- debug("0x%"PRIx64, -+ debug("0x%" PRIx64, - (uint64_t) tdata); - } else { - /* TODO: if load==2, then this is - a _signed_ load. */ -- debug("0x%"PRIx64, (uint64_t) tdata); -+ debug("0x%" PRIx64, (uint64_t) tdata); - } - } else - debug(": unreadable"); -@@ -1620,12 +1620,12 @@ int ppc_cpu_disassemble_instr(struct cpu *cpu, unsigne - if (symbol != NULL) - debug("%s", symbol); - else -- debug("0x%"PRIx64, (uint64_t) tdata); -+ debug("0x%" PRIx64, (uint64_t) tdata); - } else { - if (tdata > -256 && tdata < 256) - debug("%i", (int)tdata); - else -- debug("0x%"PRIx64, (uint64_t) tdata); -+ debug("0x%" PRIx64, (uint64_t) tdata); - } - } - debug(">"); -@@ -1817,7 +1817,7 @@ static void debug_spr_usage(uint64_t pc, int spr) - break; - } else - fatal("[ using UNIMPLEMENTED spr %i (%s), pc = " -- "0x%"PRIx64" ]\n", spr, ppc_spr_names[spr] == NULL? -+ "0x%" PRIx64" ]\n", spr, ppc_spr_names[spr] == NULL? - "UNKNOWN" : ppc_spr_names[spr], (uint64_t) pc); - } - Index: patches/patch-src_cpus_cpu_ppc_instr_cc =================================================================== RCS file: patches/patch-src_cpus_cpu_ppc_instr_cc diff -N patches/patch-src_cpus_cpu_ppc_instr_cc --- patches/patch-src_cpus_cpu_ppc_instr_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_cpus_cpu_ppc_instr_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/cpu_ppc_instr.cc ---- src/cpus/cpu_ppc_instr.cc.orig -+++ src/cpus/cpu_ppc_instr.cc -@@ -2780,7 +2780,7 @@ X(to_be_translated) - } else { - if (!cpu->translation_readahead) - fatal("[ TODO: Unimplemented ALTIVEC, iword" -- " = 0x%08"PRIx32"x ]\n", iword); -+ " = 0x%08" PRIx32"x ]\n", iword); - goto bad; - } - break; Index: patches/patch-src_cpus_cpu_sh_cc =================================================================== RCS file: patches/patch-src_cpus_cpu_sh_cc diff -N patches/patch-src_cpus_cpu_sh_cc --- patches/patch-src_cpus_cpu_sh_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,181 +0,0 @@ -$OpenBSD: patch-src_cpus_cpu_sh_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/cpu_sh.cc ---- src/cpus/cpu_sh.cc.orig -+++ src/cpus/cpu_sh.cc -@@ -462,10 +462,10 @@ void sh_cpu_register_dump(struct cpu *cpu, int gprs, i - symbol = get_symbol_name(&cpu->machine->symbol_context, - cpu->pc, &offset); - -- debug("cpu%i: pc = 0x%08"PRIx32, x, (uint32_t)cpu->pc); -+ debug("cpu%i: pc = 0x%08" PRIx32, x, (uint32_t)cpu->pc); - debug(" <%s>\n", symbol != NULL? symbol : " no symbol "); - -- debug("cpu%i: sr = 0x%08"PRIx32" (%s, %s, %s, %s, %s, %s," -+ debug("cpu%i: sr = 0x%08" PRIx32" (%s, %s, %s, %s, %s, %s," - " imask=0x%x, %s, %s)\n", x, (int32_t)cpu->cd.sh.sr, - (cpu->cd.sh.sr & SH_SR_MD)? "MD" : "!md", - (cpu->cd.sh.sr & SH_SR_RB)? "RB" : "!rb", -@@ -479,11 +479,11 @@ void sh_cpu_register_dump(struct cpu *cpu, int gprs, i - - symbol = get_symbol_name(&cpu->machine->symbol_context, - cpu->cd.sh.pr, &offset); -- debug("cpu%i: pr = 0x%08"PRIx32, x, (uint32_t)cpu->cd.sh.pr); -+ debug("cpu%i: pr = 0x%08" PRIx32, x, (uint32_t)cpu->cd.sh.pr); - debug(" <%s>\n", symbol != NULL? symbol : " no symbol "); - -- debug("cpu%i: mach = 0x%08"PRIx32" macl = 0x%08"PRIx32 -- " gbr = 0x%08"PRIx32"\n", x, (uint32_t)cpu->cd.sh.mach, -+ debug("cpu%i: mach = 0x%08" PRIx32" macl = 0x%08" PRIx32 -+ " gbr = 0x%08" PRIx32"\n", x, (uint32_t)cpu->cd.sh.mach, - (uint32_t)cpu->cd.sh.macl, (uint32_t)cpu->cd.sh.gbr); - - for (i=0; i<SH_N_GPRS; i++) { -@@ -497,7 +497,7 @@ void sh_cpu_register_dump(struct cpu *cpu, int gprs, i - - if (coprocs & 1) { - /* Floating point: */ -- debug("cpu%i: fpscr = 0x%08"PRIx32" (%s,%s,%s) fpul = 0x%08" -+ debug("cpu%i: fpscr = 0x%08" PRIx32" (%s,%s,%s) fpul = 0x%08" - PRIx32"\n", x, cpu->cd.sh.fpscr, - cpu->cd.sh.fpscr & SH_FPSCR_PR? "PR" : "!pr", - cpu->cd.sh.fpscr & SH_FPSCR_SZ? "SZ" : "!sz", -@@ -523,13 +523,13 @@ void sh_cpu_register_dump(struct cpu *cpu, int gprs, i - - if (coprocs & 2) { - /* System registers, etc: */ -- debug("cpu%i: vbr = 0x%08"PRIx32" sgr = 0x%08"PRIx32 -- " dbr = 0x%08"PRIx32"\n", x, cpu->cd.sh.vbr, cpu->cd.sh.sgr, -+ debug("cpu%i: vbr = 0x%08" PRIx32" sgr = 0x%08" PRIx32 -+ " dbr = 0x%08" PRIx32"\n", x, cpu->cd.sh.vbr, cpu->cd.sh.sgr, - cpu->cd.sh.dbr); -- debug("cpu%i: spc = 0x%08"PRIx32" ssr = 0x%08"PRIx32"\n", -+ debug("cpu%i: spc = 0x%08" PRIx32" ssr = 0x%08" PRIx32"\n", - x, cpu->cd.sh.spc, cpu->cd.sh.ssr); -- debug("cpu%i: expevt = 0x%"PRIx32" intevt = 0x%"PRIx32 -- " tra = 0x%"PRIx32"\n", x, cpu->cd.sh.expevt, -+ debug("cpu%i: expevt = 0x%" PRIx32" intevt = 0x%" PRIx32 -+ " tra = 0x%" PRIx32"\n", x, cpu->cd.sh.expevt, - cpu->cd.sh.intevt, cpu->cd.sh.tra); - - for (i=0; i<SH_N_GPRS_BANKED; i++) { -@@ -564,13 +564,13 @@ void sh_cpu_tlbdump(struct machine *m, int x, int rawf - continue; - - for (i=0; i<SH_N_ITLB_ENTRIES; i++) -- printf("cpu%i: itlb_hi_%-2i = 0x%08"PRIx32" " -- "itlb_lo_%-2i = 0x%08"PRIx32"\n", j, i, -+ printf("cpu%i: itlb_hi_%-2i = 0x%08" PRIx32" " -+ "itlb_lo_%-2i = 0x%08" PRIx32"\n", j, i, - (uint32_t) cpu->cd.sh.itlb_hi[i], i, - (uint32_t) cpu->cd.sh.itlb_lo[i]); - for (i=0; i<SH_N_UTLB_ENTRIES; i++) -- printf("cpu%i: utlb_hi_%-2i = 0x%08"PRIx32" " -- "utlb_lo_%-2i = 0x%08"PRIx32"\n", j, i, -+ printf("cpu%i: utlb_hi_%-2i = 0x%08" PRIx32" " -+ "utlb_lo_%-2i = 0x%08" PRIx32"\n", j, i, - (uint32_t) cpu->cd.sh.utlb_hi[i], i, - (uint32_t) cpu->cd.sh.utlb_lo[i]); - } -@@ -639,9 +639,9 @@ void sh_exception(struct cpu *cpu, int expevt, int int - else - debug("[ exception 0x%03x", expevt); - -- debug(", pc=0x%08"PRIx32" ", (uint32_t)cpu->pc); -+ debug(", pc=0x%08" PRIx32" ", (uint32_t)cpu->pc); - if (intevt == 0) -- debug("vaddr=0x%08"PRIx32" ", vaddr); -+ debug("vaddr=0x%08" PRIx32" ", vaddr); - - debug(" ]\n"); - } -@@ -737,7 +737,7 @@ void sh_exception(struct cpu *cpu, int expevt, int int - * these are not very common. - */ - #if 1 -- printf("\nRESERVED SuperH instruction at spc=%08"PRIx32"\n", -+ printf("\nRESERVED SuperH instruction at spc=%08" PRIx32"\n", - cpu->cd.sh.spc); - exit(1); - #else -@@ -790,7 +790,7 @@ int sh_cpu_disassemble_instr(struct cpu *cpu, unsigned - if (cpu->machine->ncpus > 1 && running) - debug("cpu%i: ", cpu->cpu_id); - -- debug("%08"PRIx32, (uint32_t) dumpaddr); -+ debug("%08" PRIx32, (uint32_t) dumpaddr); - - if (cpu->byte_order == EMUL_BIG_ENDIAN) - iword = (instr[0] << 8) + instr[1]; -@@ -828,7 +828,7 @@ int sh_cpu_disassemble_instr(struct cpu *cpu, unsigned - if (symbol != NULL) - debug("<%s>", symbol); - else -- debug("0x%08"PRIx32, addr); -+ debug("0x%08" PRIx32, addr); - } - debug("\n"); - } else if (lo4 == 0x7) -@@ -857,7 +857,7 @@ int sh_cpu_disassemble_instr(struct cpu *cpu, unsigned - if (symbol != NULL) - debug("<%s>", symbol); - else -- debug("0x%08"PRIx32, addr); -+ debug("0x%08" PRIx32, addr); - } - debug("\n"); - } else if (lo8 == 0x12) -@@ -927,7 +927,7 @@ int sh_cpu_disassemble_instr(struct cpu *cpu, unsigned - if (symbol != NULL) - debug("<%s>", symbol); - else -- debug("0x%08"PRIx32, addr); -+ debug("0x%08" PRIx32, addr); - } - debug("\n"); - break; -@@ -965,7 +965,7 @@ int sh_cpu_disassemble_instr(struct cpu *cpu, unsigned - else - debug("UNIMPLEMENTED hi4=0x%x, lo8=0x%02x", hi4, lo8); - if (running && lo4 <= 6) { -- debug("\t; r%i = 0x%08"PRIx32, r8, cpu->cd.sh.r[r8]); -+ debug("\t; r%i = 0x%08" PRIx32, r8, cpu->cd.sh.r[r8]); - } - debug("\n"); - break; -@@ -1133,7 +1133,7 @@ int sh_cpu_disassemble_instr(struct cpu *cpu, unsigned - if (symbol != NULL) - debug("\t; r%i+%i <%s>", r4, lo4 * 4, symbol); - else -- debug("\t; r%i+%i = 0x%08"PRIx32, r4, lo4 * 4, (int)addr); -+ debug("\t; r%i+%i = 0x%08" PRIx32, r4, lo4 * 4, (int)addr); - } - debug("\n"); - break; -@@ -1173,7 +1173,7 @@ int sh_cpu_disassemble_instr(struct cpu *cpu, unsigned - else - debug("UNIMPLEMENTED hi4=0x%x, lo8=0x%02x", hi4, lo8); - if (running && lo4 < 8 && (lo4 & 3) < 3) { -- debug("\t; r%i = 0x%08"PRIx32, r4, cpu->cd.sh.r[r4]); -+ debug("\t; r%i = 0x%08" PRIx32, r4, cpu->cd.sh.r[r4]); - } - debug("\n"); - break; -@@ -1187,7 +1187,7 @@ int sh_cpu_disassemble_instr(struct cpu *cpu, unsigned - else if (r8 == 0x4) - debug("mov.b\t@(%i,r%i),r0", lo4, r4); - if (running) { -- debug("\t; r%i+%i = 0x%08"PRIx32, r4, lo4, -+ debug("\t; r%i+%i = 0x%08" PRIx32, r4, lo4, - cpu->cd.sh.r[r4] + lo4); - } - debug("\n"); -@@ -1197,7 +1197,7 @@ int sh_cpu_disassemble_instr(struct cpu *cpu, unsigned - else if (r8 == 0x5) - debug("mov.w\t@(%i,r%i),r0", lo4 * 2, r4); - if (running) { -- debug("\t; r%i+%i = 0x%08"PRIx32, r4, lo4 * 2, -+ debug("\t; r%i+%i = 0x%08" PRIx32, r4, lo4 * 2, - cpu->cd.sh.r[r4] + lo4 * 2); - } - debug("\n"); Index: patches/patch-src_cpus_memory_alpha_cc =================================================================== RCS file: patches/patch-src_cpus_memory_alpha_cc diff -N patches/patch-src_cpus_memory_alpha_cc --- patches/patch-src_cpus_memory_alpha_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_cpus_memory_alpha_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/memory_alpha.cc ---- src/cpus/memory_alpha.cc.orig -+++ src/cpus/memory_alpha.cc -@@ -172,7 +172,7 @@ if (vaddr == 0xfffffffd80000000ULL) fatal("AYONA3\n"); - - not_found: - /* No match. */ -- fatal("[ alpha_translate_v2p: 0x%016"PRIx64" wasn't found ]\n", vaddr); -+ fatal("[ alpha_translate_v2p: 0x%016" PRIx64" wasn't found ]\n", vaddr); - abort(); - exit(1); - return 0; Index: patches/patch-src_cpus_memory_mips_v2p_cc =================================================================== RCS file: patches/patch-src_cpus_memory_mips_v2p_cc diff -N patches/patch-src_cpus_memory_mips_v2p_cc --- patches/patch-src_cpus_memory_mips_v2p_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_cpus_memory_mips_v2p_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/memory_mips_v2p.cc ---- src/cpus/memory_mips_v2p.cc.orig -+++ src/cpus/memory_mips_v2p.cc -@@ -294,7 +294,7 @@ int TRANSLATE_ADDRESS(struct cpu *cpu, uint64_t vaddr, - case 0x07fffff: pageshift = 22; break; - case 0x1ffffff: pageshift = 24; break; - case 0x7ffffff: pageshift = 26; break; -- default:fatal("pmask=%08"PRIx32"\n", pmask); -+ default:fatal("pmask=%08" PRIx32"\n", pmask); - exit(1); - } - Index: patches/patch-src_cpus_memory_ppc_cc =================================================================== RCS file: patches/patch-src_cpus_memory_ppc_cc diff -N patches/patch-src_cpus_memory_ppc_cc --- patches/patch-src_cpus_memory_ppc_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_cpus_memory_ppc_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/memory_ppc.cc ---- src/cpus/memory_ppc.cc.orig -+++ src/cpus/memory_ppc.cc -@@ -270,7 +270,7 @@ int ppc_translate_v2p(struct cpu *cpu, uint64_t vaddr, - return 0; - - if (!quiet_mode) -- fatal("[ memory_ppc: exception! vaddr=0x%"PRIx64" pc=0x%"PRIx64 -+ fatal("[ memory_ppc: exception! vaddr=0x%" PRIx64" pc=0x%" PRIx64 - " instr=%i user=%i wf=%i ]\n", (uint64_t) vaddr, - (uint64_t) cpu->pc, instr, user, writeflag); - Index: patches/patch-src_cpus_memory_sh_cc =================================================================== RCS file: patches/patch-src_cpus_memory_sh_cc diff -N patches/patch-src_cpus_memory_sh_cc --- patches/patch-src_cpus_memory_sh_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_cpus_memory_sh_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/cpus/memory_sh.cc ---- src/cpus/memory_sh.cc.orig -+++ src/cpus/memory_sh.cc -@@ -293,7 +293,7 @@ int sh_translate_v2p(struct cpu *cpu, uint64_t vaddr64 - } - - if (flags & FLAG_INSTR) { -- fatal("TODO: instr at 0x%08"PRIx32"\n", (uint32_t)vaddr); -+ fatal("TODO: instr at 0x%08" PRIx32"\n", (uint32_t)vaddr); - exit(1); - } - -@@ -312,7 +312,7 @@ int sh_translate_v2p(struct cpu *cpu, uint64_t vaddr64 - - /* The ugly 'if' is just here to fool Compaq CC. */ - if (!(flags & FLAG_NOEXCEPTIONS)) { -- fatal("Unimplemented SH vaddr 0x%08"PRIx32"\n", vaddr); -+ fatal("Unimplemented SH vaddr 0x%08" PRIx32"\n", vaddr); - exit(1); - } - Index: patches/patch-src_debugger_debugger_cc =================================================================== RCS file: patches/patch-src_debugger_debugger_cc diff -N patches/patch-src_debugger_debugger_cc --- patches/patch-src_debugger_debugger_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_debugger_debugger_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/debugger/debugger.cc ---- src/debugger/debugger.cc.orig -+++ src/debugger/debugger.cc -@@ -164,9 +164,9 @@ static void show_breakpoint(struct machine *m, int i) - { - printf("%3i: 0x", i); - if (m->cpus[0]->is_32bit) -- printf("%08"PRIx32, (uint32_t) m->breakpoints.addr[i]); -+ printf("%08" PRIx32, (uint32_t) m->breakpoints.addr[i]); - else -- printf("%016"PRIx64, (uint64_t) m->breakpoints.addr[i]); -+ printf("%016" PRIx64, (uint64_t) m->breakpoints.addr[i]); - if (m->breakpoints.string[i] != NULL) - printf(" (%s)", m->breakpoints.string[i]); - printf("\n"); Index: patches/patch-src_debugger_debugger_cmds_cc =================================================================== RCS file: patches/patch-src_debugger_debugger_cmds_cc diff -N patches/patch-src_debugger_debugger_cmds_cc --- patches/patch-src_debugger_debugger_cmds_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,137 +0,0 @@ -$OpenBSD: patch-src_debugger_debugger_cmds_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/debugger/debugger_cmds.cc ---- src/debugger/debugger_cmds.cc.orig -+++ src/debugger/debugger_cmds.cc -@@ -201,7 +201,7 @@ static void debugger_cmd_device(struct machine *m, cha - printf("No memory-mapped devices in this machine.\n"); - - for (i=0; i<mem->n_mmapped_devices; i++) { -- printf("%2i: %25s @ 0x%011"PRIx64", len = 0x%"PRIx64, -+ printf("%2i: %25s @ 0x%011" PRIx64", len = 0x%" PRIx64, - i, mem->devices[i].name, - (uint64_t) mem->devices[i].baseaddr, - (uint64_t) mem->devices[i].length); -@@ -313,9 +313,9 @@ static void debugger_cmd_dump(struct machine *m, char - MEM_READ, CACHE_NONE | NO_EXCEPTIONS); - - if (c->is_32bit) -- printf("0x%08"PRIx32" ", (uint32_t) addr); -+ printf("0x%08" PRIx32" ", (uint32_t) addr); - else -- printf("0x%016"PRIx64" ", (uint64_t) addr); -+ printf("0x%016" PRIx64" ", (uint64_t) addr); - - if (r == MEMORY_ACCESS_FAILED) - printf("(memory access failed)\n"); -@@ -491,9 +491,9 @@ static void debugger_cmd_lookup(struct machine *m, cha - } - printf("%s = 0x", cmd_line); - if (m->cpus[0]->is_32bit) -- printf("%08"PRIx32"\n", (uint32_t) newaddr); -+ printf("%08" PRIx32"\n", (uint32_t) newaddr); - else -- printf("%016"PRIx64"\n", (uint64_t) newaddr); -+ printf("%016" PRIx64"\n", (uint64_t) newaddr); - return; - } - -@@ -501,9 +501,9 @@ static void debugger_cmd_lookup(struct machine *m, cha - - if (symbol != NULL) { - if (m->cpus[0]->is_32bit) -- printf("0x%08"PRIx32, (uint32_t) addr); -+ printf("0x%08" PRIx32, (uint32_t) addr); - else -- printf("0x%016"PRIx64, (uint64_t) addr); -+ printf("0x%016" PRIx64, (uint64_t) addr); - printf(" = %s\n", symbol); - } else - printf("lookup for '%s' failed\n", cmd_line); -@@ -636,16 +636,16 @@ static void debugger_cmd_print(struct machine *m, char - printf("Multiple matches. Try prefixing with %%, $, or @.\n"); - break; - case PARSE_SETTINGS: -- printf("%s = 0x%"PRIx64"\n", cmd_line, (uint64_t)tmp); -+ printf("%s = 0x%" PRIx64"\n", cmd_line, (uint64_t)tmp); - break; - case PARSE_SYMBOL: - if (m->cpus[0]->is_32bit) -- printf("%s = 0x%08"PRIx32"\n", cmd_line, (uint32_t)tmp); -+ printf("%s = 0x%08" PRIx32"\n", cmd_line, (uint32_t)tmp); - else -- printf("%s = 0x%016"PRIx64"\n", cmd_line,(uint64_t)tmp); -+ printf("%s = 0x%016" PRIx64"\n", cmd_line,(uint64_t)tmp); - break; - case PARSE_NUMBER: -- printf("0x%"PRIx64"\n", (uint64_t) tmp); -+ printf("0x%" PRIx64"\n", (uint64_t) tmp); - break; - } - } -@@ -754,12 +754,12 @@ static void debugger_cmd_put(struct machine *m, char * - case 'b': - a_byte = data; - if (m->cpus[0]->is_32bit) -- printf("0x%08"PRIx32, (uint32_t) addr); -+ printf("0x%08" PRIx32, (uint32_t) addr); - else -- printf("0x%016"PRIx64, (uint64_t) addr); -+ printf("0x%016" PRIx64, (uint64_t) addr); - printf(": %02x", a_byte); - if (data > 255) -- printf(" (NOTE: truncating %0"PRIx64")", -+ printf(" (NOTE: truncating %0" PRIx64")", - (uint64_t) data); - res = m->cpus[0]->memory_rw(m->cpus[0], m->cpus[0]->mem, addr, - &a_byte, 1, MEM_WRITE, CACHE_NONE | NO_EXCEPTIONS); -@@ -771,12 +771,12 @@ static void debugger_cmd_put(struct machine *m, char * - if ((addr & 1) != 0) - printf("WARNING: address isn't aligned\n"); - if (m->cpus[0]->is_32bit) -- printf("0x%08"PRIx32, (uint32_t) addr); -+ printf("0x%08" PRIx32, (uint32_t) addr); - else -- printf("0x%016"PRIx64, (uint64_t) addr); -+ printf("0x%016" PRIx64, (uint64_t) addr); - printf(": %04x", (int)data); - if (data > 0xffff) -- printf(" (NOTE: truncating %0"PRIx64")", -+ printf(" (NOTE: truncating %0" PRIx64")", - (uint64_t) data); - res = store_16bit_word(m->cpus[0], addr, data); - if (!res) -@@ -787,15 +787,15 @@ static void debugger_cmd_put(struct machine *m, char * - if ((addr & 3) != 0) - printf("WARNING: address isn't aligned\n"); - if (m->cpus[0]->is_32bit) -- printf("0x%08"PRIx32, (uint32_t) addr); -+ printf("0x%08" PRIx32, (uint32_t) addr); - else -- printf("0x%016"PRIx64, (uint64_t) addr); -+ printf("0x%016" PRIx64, (uint64_t) addr); - - printf(": %08x", (int)data); - - if (data > 0xffffffff && (data >> 32) != 0 - && (data >> 32) != 0xffffffff) -- printf(" (NOTE: truncating %0"PRIx64")", -+ printf(" (NOTE: truncating %0" PRIx64")", - (uint64_t) data); - - res = store_32bit_word(m->cpus[0], addr, data); -@@ -807,11 +807,11 @@ static void debugger_cmd_put(struct machine *m, char * - if ((addr & 7) != 0) - printf("WARNING: address isn't aligned\n"); - if (m->cpus[0]->is_32bit) -- printf("0x%08"PRIx32, (uint32_t) addr); -+ printf("0x%08" PRIx32, (uint32_t) addr); - else -- printf("0x%016"PRIx64, (uint64_t) addr); -+ printf("0x%016" PRIx64, (uint64_t) addr); - -- printf(": %016"PRIx64, (uint64_t) data); -+ printf(": %016" PRIx64, (uint64_t) data); - - res = store_64bit_word(m->cpus[0], addr, data); - if (!res) Index: patches/patch-src_devices_bus_pci_cc =================================================================== RCS file: patches/patch-src_devices_bus_pci_cc diff -N patches/patch-src_devices_bus_pci_cc --- patches/patch-src_devices_bus_pci_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_devices_bus_pci_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/devices/bus_pci.cc ---- src/devices/bus_pci.cc.orig -+++ src/devices/bus_pci.cc -@@ -1095,7 +1095,7 @@ printf("reg = 0x%x\n", reg); - case PCI_COMMAND_STATUS_REG: - if (value & PCI_COMMAND_IO_ENABLE) - enabled = 1; --printf(" value = 0x%"PRIx32"\n", value); -+printf(" value = 0x%" PRIx32"\n", value); - if (wdc0 != NULL) - wdc_set_io_enabled((struct wdc_data *) wdc0, enabled); - if (wdc1 != NULL) Index: patches/patch-src_devices_dev_algor_cc =================================================================== RCS file: patches/patch-src_devices_dev_algor_cc diff -N patches/patch-src_devices_dev_algor_cc --- patches/patch-src_devices_dev_algor_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ -$OpenBSD: patch-src_devices_dev_algor_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/devices/dev_algor.cc ---- src/devices/dev_algor.cc.orig -+++ src/devices/dev_algor.cc -@@ -175,17 +175,17 @@ DEVICE_ACCESS(algor) - fatal("[ algor: read from 0x%x ]\n", - (int)relative_addr); - } else { -- fatal("[ algor: write to 0x%x: 0x%"PRIx64" ]\n", -+ fatal("[ algor: write to 0x%x: 0x%" PRIx64" ]\n", - (int) relative_addr, (uint64_t) idata); - } - } - - if (n != NULL) { - if (writeflag == MEM_READ) { -- debug("[ algor: read from %s: 0x%"PRIx64" ]\n", -+ debug("[ algor: read from %s: 0x%" PRIx64" ]\n", - n, (uint64_t) odata); - } else { -- debug("[ algor: write to %s: 0x%"PRIx64" ]\n", -+ debug("[ algor: write to %s: 0x%" PRIx64" ]\n", - n, (uint64_t) idata); - } - } Index: patches/patch-src_devices_dev_dreamcast_gdrom_cc =================================================================== RCS file: patches/patch-src_devices_dev_dreamcast_gdrom_cc diff -N patches/patch-src_devices_dev_dreamcast_gdrom_cc --- patches/patch-src_devices_dev_dreamcast_gdrom_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_devices_dev_dreamcast_gdrom_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/devices/dev_dreamcast_gdrom.cc ---- src/devices/dev_dreamcast_gdrom.cc.orig -+++ src/devices/dev_dreamcast_gdrom.cc -@@ -474,7 +474,7 @@ DEVICE_ACCESS(dreamcast_gdrom_dma) - // GDROM DMA transfer. - uint32_t dst = d->dma_reg[0x04 / sizeof(uint32_t)]; - int length = d->dma_reg[0x08 / sizeof(uint32_t)]; -- fatal("[ dreamcast_gdrom_dma: Transfering %i bytes to 0x%08"PRIx32" ]\n", length, dst); -+ fatal("[ dreamcast_gdrom_dma: Transfering %i bytes to 0x%08" PRIx32" ]\n", length, dst); - - if (d->data == NULL) { - fatal("dreamcast_gdrom_dma: DMA transfer but d->data is NULL. TODO\n"); Index: patches/patch-src_devices_dev_dreamcast_maple_cc =================================================================== RCS file: patches/patch-src_devices_dev_dreamcast_maple_cc diff -N patches/patch-src_devices_dev_dreamcast_maple_cc --- patches/patch-src_devices_dev_dreamcast_maple_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ -$OpenBSD: patch-src_devices_dev_dreamcast_maple_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/devices/dev_dreamcast_maple.cc ---- src/devices/dev_dreamcast_maple.cc.orig -+++ src/devices/dev_dreamcast_maple.cc -@@ -394,7 +394,7 @@ void maple_do_dma_xfer(struct cpu *cpu, struct dreamca - * Comstedt's Maple demo program. - */ - if (addr & 0x1f) { -- fatal("[ dreamcast_maple: dmaaddr 0x%08"PRIx32" is NOT" -+ fatal("[ dreamcast_maple: dmaaddr 0x%08" PRIx32" is NOT" - " 32-byte aligned; aborting ]\n", addr); - return; - } -@@ -432,7 +432,7 @@ void maple_do_dma_xfer(struct cpu *cpu, struct dreamca - - if (receive_addr & 0xe000001f) - fatal("[ dreamcast_maple: WARNING! receive address 0x" -- "%08"PRIx32" isn't valid! ]\n", receive_addr); -+ "%08" PRIx32" isn't valid! ]\n", receive_addr); - - /* Read the command word for this message: */ - cpu->memory_rw(cpu, cpu->mem, addr, (unsigned char *) (void *) &buf, 4, MEM_READ, -@@ -515,7 +515,7 @@ void maple_do_dma_xfer(struct cpu *cpu, struct dreamca - d, cpu, port, receive_addr); - } else { - fatal("[ dreamcast_maple: WARNING: GETCOND: " -- "UNIMPLEMENTED 0x%08"PRIx32" ]\n", cond); -+ "UNIMPLEMENTED 0x%08" PRIx32" ]\n", cond); - exit(1); - } - break; Index: patches/patch-src_devices_dev_lca_cc =================================================================== RCS file: patches/patch-src_devices_dev_lca_cc diff -N patches/patch-src_devices_dev_lca_cc --- patches/patch-src_devices_dev_lca_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,50 +0,0 @@ -$OpenBSD: patch-src_devices_dev_lca_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/devices/dev_lca.cc ---- src/devices/dev_lca.cc.orig -+++ src/devices/dev_lca.cc -@@ -221,7 +221,7 @@ DEVICE_ACCESS(lca_ioc) - /* TODO: Actually implement this. */ - if (idata & ~IOC_TB_ENA_TEN) { - fatal("TODO: LCA_IOC_TB_ENA value " -- " (0x%"PRIx64") has unimplemented " -+ " (0x%" PRIx64") has unimplemented " - "bits.\n", (uint64_t)idata); - exit(1); - } -@@ -236,7 +236,7 @@ DEVICE_ACCESS(lca_ioc) - /* TODO: Actually implement this. */ - if (idata != 0ULL && idata != 0x300800000ULL) { - fatal("TODO: LCA_IOC_W_BASE0 value differs" -- " (0x%"PRIx64") from the only implemented" -+ " (0x%" PRIx64") from the only implemented" - " values\n", (uint64_t)idata); - exit(1); - } -@@ -251,7 +251,7 @@ DEVICE_ACCESS(lca_ioc) - /* TODO: Actually implement this. */ - if (idata != 0x700000ULL) { - fatal("TODO: LCA_IOC_W_MASK0 value differs" -- " (0x%"PRIx64") from the only implemented" -+ " (0x%" PRIx64") from the only implemented" - " value\n", (uint64_t)idata); - exit(1); - } -@@ -275,7 +275,7 @@ DEVICE_ACCESS(lca_ioc) - /* TODO: Actually implement this. */ - if (idata != 0x240000000ULL) { - fatal("TODO: LCA_IOC_W_BASE1 value differs" -- " (0x%"PRIx64") from the only implemented" -+ " (0x%" PRIx64") from the only implemented" - " value\n", (uint64_t)idata); - exit(1); - } -@@ -290,7 +290,7 @@ DEVICE_ACCESS(lca_ioc) - /* TODO: Actually implement this. */ - if (idata != 0x3ff00000ULL) { - fatal("TODO: LCA_IOC_W_MASK1 value differs" -- " (0x%"PRIx64") from the only implemented" -+ " (0x%" PRIx64") from the only implemented" - " value\n", (uint64_t)idata); - exit(1); - } Index: patches/patch-src_devices_dev_pvr_cc =================================================================== RCS file: patches/patch-src_devices_dev_pvr_cc diff -N patches/patch-src_devices_dev_pvr_cc --- patches/patch-src_devices_dev_pvr_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,193 +0,0 @@ -$OpenBSD: patch-src_devices_dev_pvr_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/devices/dev_pvr.cc ---- src/devices/dev_pvr.cc.orig -+++ src/devices/dev_pvr.cc -@@ -1595,11 +1595,11 @@ DEVICE_ACCESS(pvr) - - case PVRREG_OB_ADDR: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: OB_ADDR set to 0x%08"PRIx32" ]\n", -+ debug("[ pvr: OB_ADDR set to 0x%08" PRIx32" ]\n", - (uint32_t)(idata & PVR_OB_ADDR_MASK)); - if (idata & ~PVR_OB_ADDR_MASK) { - fatal("[ pvr: OB_ADDR: Fatal error: Unknown" -- " bits set: 0x%08"PRIx32" ]\n", -+ " bits set: 0x%08" PRIx32" ]\n", - (uint32_t)(idata & ~PVR_OB_ADDR_MASK)); - exit(1); - } -@@ -1610,11 +1610,11 @@ DEVICE_ACCESS(pvr) - - case PVRREG_TILEBUF_ADDR: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: TILEBUF_ADDR set to 0x%08"PRIx32" ]\n", -+ debug("[ pvr: TILEBUF_ADDR set to 0x%08" PRIx32" ]\n", - (uint32_t)(idata & PVR_TILEBUF_ADDR_MASK)); - if (idata & ~PVR_TILEBUF_ADDR_MASK) { - fatal("[ pvr: TILEBUF_ADDR: Unknown" -- " bits set: 0x%08"PRIx32" ]\n", -+ " bits set: 0x%08" PRIx32" ]\n", - (uint32_t)(idata & ~PVR_TILEBUF_ADDR_MASK)); - exit(1); - } -@@ -1640,7 +1640,7 @@ DEVICE_ACCESS(pvr) - - case PVRREG_BRDCOLR: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: BRDCOLR set to 0x%06"PRIx32" ]\n", -+ debug("[ pvr: BRDCOLR set to 0x%06" PRIx32" ]\n", - (int)idata); - DEFAULT_WRITE; - d->border_updated = 1; -@@ -1701,7 +1701,7 @@ DEVICE_ACCESS(pvr) - - case PVRREG_FB_RENDER_ADDR1: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: FB_RENDER_ADDR1 set to 0x%08"PRIx32 -+ debug("[ pvr: FB_RENDER_ADDR1 set to 0x%08" PRIx32 - " ]\n", (int) idata); - DEFAULT_WRITE; - } -@@ -1709,7 +1709,7 @@ DEVICE_ACCESS(pvr) - - case PVRREG_FB_RENDER_ADDR2: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: FB_RENDER_ADDR2 set to 0x%08"PRIx32 -+ debug("[ pvr: FB_RENDER_ADDR2 set to 0x%08" PRIx32 - " ]\n", (int) idata); - DEFAULT_WRITE; - } -@@ -1802,10 +1802,10 @@ DEVICE_ACCESS(pvr) - - case PVRREG_VRAM_CFG1: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: VRAM_CFG1 set to 0x%08"PRIx32, -+ debug("[ pvr: VRAM_CFG1 set to 0x%08" PRIx32, - (int) idata); - if (idata != VRAM_CFG1_GOOD_REFRESH_VALUE) -- fatal("{ VRAM_CFG1 = 0x%08"PRIx32" is not " -+ fatal("{ VRAM_CFG1 = 0x%08" PRIx32" is not " - "yet implemented! }", (int) idata); - debug(" ]\n"); - DEFAULT_WRITE; -@@ -1814,10 +1814,10 @@ DEVICE_ACCESS(pvr) - - case PVRREG_VRAM_CFG2: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: VRAM_CFG2 set to 0x%08"PRIx32, -+ debug("[ pvr: VRAM_CFG2 set to 0x%08" PRIx32, - (int) idata); - if (idata != VRAM_CFG2_UNKNOWN_MAGIC) -- fatal("{ VRAM_CFG2 = 0x%08"PRIx32" is not " -+ fatal("{ VRAM_CFG2 = 0x%08" PRIx32" is not " - "yet implemented! }", (int) idata); - debug(" ]\n"); - DEFAULT_WRITE; -@@ -1826,10 +1826,10 @@ DEVICE_ACCESS(pvr) - - case PVRREG_VRAM_CFG3: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: VRAM_CFG3 set to 0x%08"PRIx32, -+ debug("[ pvr: VRAM_CFG3 set to 0x%08" PRIx32, - (int) idata); - if (idata != VRAM_CFG3_UNKNOWN_MAGIC) -- fatal("{ VRAM_CFG3 = 0x%08"PRIx32" is not " -+ fatal("{ VRAM_CFG3 = 0x%08" PRIx32" is not " - "yet implemented! }", (int) idata); - debug(" ]\n"); - DEFAULT_WRITE; -@@ -1838,7 +1838,7 @@ DEVICE_ACCESS(pvr) - - case PVRREG_FOG_TABLE_COL: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: FOG_TABLE_COL set to 0x%06"PRIx32" ]\n", -+ debug("[ pvr: FOG_TABLE_COL set to 0x%06" PRIx32" ]\n", - (int) idata); - DEFAULT_WRITE; - } -@@ -1846,7 +1846,7 @@ DEVICE_ACCESS(pvr) - - case PVRREG_FOG_VERTEX_COL: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: FOG_VERTEX_COL set to 0x%06"PRIx32" ]\n", -+ debug("[ pvr: FOG_VERTEX_COL set to 0x%06" PRIx32" ]\n", - (int) idata); - DEFAULT_WRITE; - } -@@ -1854,7 +1854,7 @@ DEVICE_ACCESS(pvr) - - case PVRREG_FOG_DENSITY: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: FOG_DENSITY set to 0x%08"PRIx32" ]\n", -+ debug("[ pvr: FOG_DENSITY set to 0x%08" PRIx32" ]\n", - (int) idata); - DEFAULT_WRITE; - } -@@ -1862,7 +1862,7 @@ DEVICE_ACCESS(pvr) - - case PVRREG_CLAMP_MAX: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: CLAMP_MAX set to 0x%06"PRIx32" ]\n", -+ debug("[ pvr: CLAMP_MAX set to 0x%06" PRIx32" ]\n", - (int) idata); - DEFAULT_WRITE; - } -@@ -1870,7 +1870,7 @@ DEVICE_ACCESS(pvr) - - case PVRREG_CLAMP_MIN: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: CLAMP_MIN set to 0x%06"PRIx32" ]\n", -+ debug("[ pvr: CLAMP_MIN set to 0x%06" PRIx32" ]\n", - (int) idata); - DEFAULT_WRITE; - } -@@ -1896,7 +1896,7 @@ DEVICE_ACCESS(pvr) - - case PVRREG_DIWADDRL: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: DIWADDRL set to 0x%08"PRIx32" ]\n", -+ debug("[ pvr: DIWADDRL set to 0x%08" PRIx32" ]\n", - (int) idata); - pvr_fb_invalidate(d, -1, -1); - DEFAULT_WRITE; -@@ -1905,7 +1905,7 @@ DEVICE_ACCESS(pvr) - - case PVRREG_DIWADDRS: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: DIWADDRS set to 0x%08"PRIx32" ]\n", -+ debug("[ pvr: DIWADDRS set to 0x%08" PRIx32" ]\n", - (int) idata); - pvr_fb_invalidate(d, -1, -1); - DEFAULT_WRITE; -@@ -2056,10 +2056,10 @@ DEVICE_ACCESS(pvr) - - case PVRREG_MAGIC_110: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: MAGIC_110 set to 0x%08"PRIx32, -+ debug("[ pvr: MAGIC_110 set to 0x%08" PRIx32, - (int) idata); - if (idata != MAGIC_110_VALUE) -- fatal("{ MAGIC_110 = 0x%08"PRIx32" is not " -+ fatal("{ MAGIC_110 = 0x%08" PRIx32" is not " - "yet implemented! }", (int) idata); - debug(" ]\n"); - DEFAULT_WRITE; -@@ -2068,7 +2068,7 @@ DEVICE_ACCESS(pvr) - - case PVRREG_TA_LUMINANCE: - if (writeflag == MEM_WRITE) { -- debug("[ pvr: TA_LUMINANCE set to 0x%08"PRIx32" ]\n", -+ debug("[ pvr: TA_LUMINANCE set to 0x%08" PRIx32" ]\n", - (int) idata); - DEFAULT_WRITE; - } -@@ -2175,7 +2175,7 @@ DEVICE_ACCESS(pvr) - pvr_ta_init(cpu, d); - - if (idata != PVR_TA_INIT && idata != 0) -- fatal("{ TA_INIT = 0x%08"PRIx32" is not " -+ fatal("{ TA_INIT = 0x%08" PRIx32" is not " - "yet implemented! }", (int) idata); - - /* Always reset to 0. */ Index: patches/patch-src_devices_dev_sgi_mardigras_cc =================================================================== RCS file: patches/patch-src_devices_dev_sgi_mardigras_cc diff -N patches/patch-src_devices_dev_sgi_mardigras_cc --- patches/patch-src_devices_dev_sgi_mardigras_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_devices_dev_sgi_mardigras_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/devices/dev_sgi_mardigras.cc ---- src/devices/dev_sgi_mardigras.cc.orig -+++ src/devices/dev_sgi_mardigras.cc -@@ -203,7 +203,7 @@ void mardigras_20400(struct cpu *cpu, struct sgi_mardi - return; - } - -- debug("mardigras_20400(): 0x%016"PRIx64"\n", (uint64_t) idata); -+ debug("mardigras_20400(): 0x%016" PRIx64"\n", (uint64_t) idata); - } - - -@@ -285,7 +285,7 @@ DEVICE_ACCESS(sgi_mardigras) - debug("[ sgi_mardigras: read from 0x%08lx ]\n", - (long)relative_addr); - } else { -- debug("[ sgi_mardigras: write to 0x%08lx: 0x%016"PRIx64 -+ debug("[ sgi_mardigras: write to 0x%08lx: 0x%016" PRIx64 - " ]\n", (long) relative_addr, (uint64_t) idata); - } - } Index: patches/patch-src_devices_dev_sh4_cc =================================================================== RCS file: patches/patch-src_devices_dev_sh4_cc diff -N patches/patch-src_devices_dev_sh4_cc --- patches/patch-src_devices_dev_sh4_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,98 +0,0 @@ -$OpenBSD: patch-src_devices_dev_sh4_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/devices/dev_sh4.cc ---- src/devices/dev_sh4.cc.orig -+++ src/devices/dev_sh4.cc -@@ -844,7 +844,7 @@ DEVICE_ACCESS(sh4_pcic) - /* Hardcoded to what OpenBSD/landisk uses: */ - if (writeflag == MEM_WRITE && idata != 0xac000000) { - fatal("sh4_pcic: SH4_PCICONF5 unknown value" -- " 0x%"PRIx32"\n", (uint32_t) idata); -+ " 0x%" PRIx32"\n", (uint32_t) idata); - exit(1); - } - break; -@@ -853,7 +853,7 @@ DEVICE_ACCESS(sh4_pcic) - /* Hardcoded to what OpenBSD/landisk uses: */ - if (writeflag == MEM_WRITE && idata != 0x8c000000) { - fatal("sh4_pcic: SH4_PCICONF6 unknown value" -- " 0x%"PRIx32"\n", (uint32_t) idata); -+ " 0x%" PRIx32"\n", (uint32_t) idata); - exit(1); - } - break; -@@ -862,7 +862,7 @@ DEVICE_ACCESS(sh4_pcic) - /* Hardcoded to what OpenBSD/landisk uses: */ - if (writeflag == MEM_WRITE && idata != ((64 - 1) << 20)) { - fatal("sh4_pcic: SH4_PCILSR0 unknown value" -- " 0x%"PRIx32"\n", (uint32_t) idata); -+ " 0x%" PRIx32"\n", (uint32_t) idata); - exit(1); - } - break; -@@ -871,7 +871,7 @@ DEVICE_ACCESS(sh4_pcic) - /* Hardcoded to what OpenBSD/landisk uses: */ - if (writeflag == MEM_WRITE && idata != 0xac000000) { - fatal("sh4_pcic: SH4_PCILAR0 unknown value" -- " 0x%"PRIx32"\n", (uint32_t) idata); -+ " 0x%" PRIx32"\n", (uint32_t) idata); - exit(1); - } - break; -@@ -880,7 +880,7 @@ DEVICE_ACCESS(sh4_pcic) - /* Hardcoded to what OpenBSD/landisk uses: */ - if (writeflag == MEM_WRITE && idata != ((64 - 1) << 20)) { - fatal("sh4_pcic: SH4_PCILSR1 unknown value" -- " 0x%"PRIx32"\n", (uint32_t) idata); -+ " 0x%" PRIx32"\n", (uint32_t) idata); - exit(1); - } - break; -@@ -889,15 +889,15 @@ DEVICE_ACCESS(sh4_pcic) - /* Hardcoded to what OpenBSD/landisk uses: */ - if (writeflag == MEM_WRITE && idata != 0xac000000) { - fatal("sh4_pcic: SH4_PCILAR1 unknown value" -- " 0x%"PRIx32"\n", (uint32_t) idata); -+ " 0x%" PRIx32"\n", (uint32_t) idata); - exit(1); - } - break; - - case SH4_PCIMBR: - if (writeflag == MEM_WRITE && idata != SH4_PCIC_MEM) { -- fatal("sh4_pcic: PCIMBR set to 0x%"PRIx32", not" -- " 0x%"PRIx32"? TODO\n", (uint32_t) idata, -+ fatal("sh4_pcic: PCIMBR set to 0x%" PRIx32", not" -+ " 0x%" PRIx32"? TODO\n", (uint32_t) idata, - (uint32_t) SH4_PCIC_MEM); - exit(1); - } -@@ -905,8 +905,8 @@ DEVICE_ACCESS(sh4_pcic) - - case SH4_PCIIOBR: - if (writeflag == MEM_WRITE && idata != SH4_PCIC_IO) { -- fatal("sh4_pcic: PCIIOBR set to 0x%"PRIx32", not" -- " 0x%"PRIx32"? TODO\n", (uint32_t) idata, -+ fatal("sh4_pcic: PCIIOBR set to 0x%" PRIx32", not" -+ " 0x%" PRIx32"? TODO\n", (uint32_t) idata, - (uint32_t) SH4_PCIC_IO); - exit(1); - } -@@ -982,7 +982,7 @@ DEVICE_ACCESS(sh4) - d->sdmr3 = v; - else - d->sdmr2 = v; -- debug("[ sh4: sdmr%i set to 0x%04"PRIx16" ]\n", -+ debug("[ sh4: sdmr%i set to 0x%04" PRIx16" ]\n", - relative_addr & 0x00040000? 3 : 2, v); - return 1; - } -@@ -1235,7 +1235,7 @@ DEVICE_ACCESS(sh4) - if (idata & (TCR_ICPF | TCR_ICPE1 | TCR_ICPE0 | - TCR_CKEG1 | TCR_CKEG0 | TCR_TPSC2)) { - fatal("Unimplemented SH4 timer control" -- " bits: 0x%08"PRIx32". Aborting.\n", -+ " bits: 0x%08" PRIx32". Aborting.\n", - (int) idata); - exit(1); - } Index: patches/patch-src_devices_dev_vga_cc =================================================================== RCS file: patches/patch-src_devices_dev_vga_cc diff -N patches/patch-src_devices_dev_vga_cc --- patches/patch-src_devices_dev_vga_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_devices_dev_vga_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/devices/dev_vga.cc ---- src/devices/dev_vga.cc.orig -+++ src/devices/dev_vga.cc -@@ -516,7 +516,7 @@ DEVICE_TICK(vga) - int base = ((d->crtc_reg[VGA_CRTC_START_ADDR_HIGH] << 8) - + d->crtc_reg[VGA_CRTC_START_ADDR_LOW]) * 2; - int new_u_y1, new_u_y2; -- debug("[ dev_vga_tick: dyntrans access, %"PRIx64" .. %" -+ debug("[ dev_vga_tick: dyntrans access, %" PRIx64" .. %" - PRIx64" ]\n", (uint64_t) low, (uint64_t) high); - low -= base; - high -= base; Index: patches/patch-src_devices_dev_vr41xx_cc =================================================================== RCS file: patches/patch-src_devices_dev_vr41xx_cc diff -N patches/patch-src_devices_dev_vr41xx_cc --- patches/patch-src_devices_dev_vr41xx_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,37 +0,0 @@ -$OpenBSD: patch-src_devices_dev_vr41xx_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/devices/dev_vr41xx.cc ---- src/devices/dev_vr41xx.cc.orig -+++ src/devices/dev_vr41xx.cc -@@ -466,7 +466,7 @@ static uint64_t vr41xx_kiu(struct cpu *cpu, int ofs, u - default: - if (writeflag == MEM_WRITE) - debug("[ vr41xx KIU: unimplemented write to offset " -- "0x%x, data=0x%016"PRIx64" ]\n", ofs, -+ "0x%x, data=0x%016" PRIx64" ]\n", ofs, - (uint64_t) idata); - else - debug("[ vr41xx KIU: unimplemented read from offset " -@@ -638,11 +638,11 @@ DEVICE_ACCESS(vr41xx) - default: - if (writeflag == MEM_WRITE) - debug("[ vr41xx: unimplemented write to address " -- "0x%"PRIx64", data=0x%016"PRIx64" ]\n", -+ "0x%" PRIx64", data=0x%016" PRIx64" ]\n", - (uint64_t) relative_addr, (uint64_t) idata); - else - debug("[ vr41xx: unimplemented read from address " -- "0x%"PRIx64" ]\n", (uint64_t) relative_addr); -+ "0x%" PRIx64" ]\n", (uint64_t) relative_addr); - } - - ret: -@@ -776,7 +776,7 @@ struct vr41xx_data *dev_vr41xx_init(struct machine *ma - */ - if (cpumodel == 4131) { - snprintf(tmps, sizeof(tmps), "ns16550 irq=%s.cpu[%i].vrip.%i " -- "addr=0x%"PRIx64" name2=siu", machine->path, -+ "addr=0x%" PRIx64" name2=siu", machine->path, - machine->bootstrap_cpu, VRIP_INTR_SIU, - (uint64_t) (baseaddr+0x800)); - device_add(machine, tmps); Index: patches/patch-src_devices_dev_wdc_cc =================================================================== RCS file: patches/patch-src_devices_dev_wdc_cc diff -N patches/patch-src_devices_dev_wdc_cc --- patches/patch-src_devices_dev_wdc_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,41 +0,0 @@ -$OpenBSD: patch-src_devices_dev_wdc_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/devices/dev_wdc.cc ---- src/devices/dev_wdc.cc.orig -+++ src/devices/dev_wdc.cc -@@ -580,13 +580,13 @@ DEVICE_ACCESS(wdc) - } - - if (d->data_debug) { -- const char *s = "0x%04"PRIx64" ]\n"; -+ const char *s = "0x%04" PRIx64" ]\n"; - if (len == 1) -- s = "0x%02"PRIx64" ]\n"; -+ s = "0x%02" PRIx64" ]\n"; - if (len == 4) -- s = "0x%08"PRIx64" ]\n"; -+ s = "0x%08" PRIx64" ]\n"; - if (len == 8) -- s = "0x%016"PRIx64" ]\n"; -+ s = "0x%016" PRIx64" ]\n"; - debug("[ wdc: read from DATA: "); - debug(s, (uint64_t) odata); - } -@@ -621,13 +621,13 @@ DEVICE_ACCESS(wdc) - } else { - int inbuf_len; - if (d->data_debug) { -- const char *s = "0x%04"PRIx64" ]\n"; -+ const char *s = "0x%04" PRIx64" ]\n"; - if (len == 1) -- s = "0x%02"PRIx64" ]\n"; -+ s = "0x%02" PRIx64" ]\n"; - if (len == 4) -- s = "0x%08"PRIx64" ]\n"; -+ s = "0x%08" PRIx64" ]\n"; - if (len == 8) -- s = "0x%016"PRIx64" ]\n"; -+ s = "0x%016" PRIx64" ]\n"; - debug("[ wdc: write to DATA: "); - debug(s, (uint64_t) idata); - } Index: patches/patch-src_disk_bootblock_cc =================================================================== RCS file: patches/patch-src_disk_bootblock_cc diff -N patches/patch-src_disk_bootblock_cc --- patches/patch-src_disk_bootblock_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_disk_bootblock_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/disk/bootblock.cc ---- src/disk/bootblock.cc.orig -+++ src/disk/bootblock.cc -@@ -177,7 +177,7 @@ int load_bootblock(struct machine *m, struct cpu *cpu, - /* Convert loadaddr to uncached: */ - if ((bootblock_loadaddr & 0xf0000000ULL) != 0x80000000 && - (bootblock_loadaddr & 0xf0000000ULL) != 0xa0000000) { -- fatal("\nWARNING! Weird load address 0x%08"PRIx32 -+ fatal("\nWARNING! Weird load address 0x%08" PRIx32 - " for SCSI id %i.\n\n", - (uint32_t)bootblock_loadaddr, boot_disk_id); - if (bootblock_loadaddr == 0) { -@@ -198,7 +198,7 @@ int load_bootblock(struct machine *m, struct cpu *cpu, - bootblock_pc |= 0xffffffffa0000000ULL; - cpu->pc = bootblock_pc; - -- debug("DEC boot: loadaddr=0x%08"PRIx32", pc=0x%08"PRIx32, -+ debug("DEC boot: loadaddr=0x%08" PRIx32", pc=0x%08" PRIx32, - (uint32_t) bootblock_loadaddr, (uint32_t) bootblock_pc); - - readofs = 0x18; Index: patches/patch-src_disk_diskimage_cc =================================================================== RCS file: patches/patch-src_disk_diskimage_cc diff -N patches/patch-src_disk_diskimage_cc --- patches/patch-src_disk_diskimage_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_disk_diskimage_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/disk/diskimage.cc ---- src/disk/diskimage.cc.orig -+++ src/disk/diskimage.cc -@@ -732,7 +732,7 @@ int diskimage_add(struct machine *machine, char *fname - if (*fname == ':' || *fname == ';') - fname ++; - if (override_base_offset < 0) { -- fatal("Bad base offset: %"PRIi64 -+ fatal("Bad base offset: %" PRIi64 - "\n", override_base_offset); - exit(1); - } Index: patches/patch-src_file_file_elf_cc =================================================================== RCS file: patches/patch-src_file_file_elf_cc diff -N patches/patch-src_file_file_elf_cc --- patches/patch-src_file_file_elf_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,102 +0,0 @@ -$OpenBSD: patch-src_file_file_elf_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/file/file_elf.cc ---- src/file/file_elf.cc.orig -+++ src/file/file_elf.cc -@@ -326,9 +326,9 @@ static void file_load_elf(struct machine *m, struct me - encoding == ELFDATA2LSB? "LSB (LE)" : "MSB (BE)", s); - - if (elf64) -- debug("%016"PRIx64"\n", (uint64_t) eentry); -+ debug("%016" PRIx64"\n", (uint64_t) eentry); - else -- debug("%08"PRIx32"\n", (uint32_t) eentry); -+ debug("%08" PRIx32"\n", (uint32_t) eentry); - - /* - * SH64: 32-bit instruction encoding? -@@ -400,34 +400,34 @@ static void file_load_elf(struct machine *m, struct me - if (p_type == PT_LOAD) - debug("load"); - else -- debug("0x%08"PRIx32, (uint32_t) p_type); -+ debug("0x%08" PRIx32, (uint32_t) p_type); - -- debug(") @ 0x%"PRIx64", vaddr 0x", (uint64_t) p_offset); -+ debug(") @ 0x%" PRIx64", vaddr 0x", (uint64_t) p_offset); - - if (elf64) -- debug("%016"PRIx64, (uint64_t) p_vaddr); -+ debug("%016" PRIx64, (uint64_t) p_vaddr); - else -- debug("%08"PRIx32, (uint32_t) p_vaddr); -+ debug("%08" PRIx32, (uint32_t) p_vaddr); - -- debug(" len=0x%"PRIx64"\n", (uint64_t) p_memsz); -+ debug(" len=0x%" PRIx64"\n", (uint64_t) p_memsz); - - if (p_vaddr != p_paddr) { - if (elf64) -- debug("NOTE: vaddr (0x%"PRIx64") and " -- "paddr (0x%"PRIx64") differ; using " -+ debug("NOTE: vaddr (0x%" PRIx64") and " -+ "paddr (0x%" PRIx64") differ; using " - "vaddr\n", (uint64_t) p_vaddr, - (uint64_t) p_paddr); - else -- debug("NOTE: vaddr (0x%08"PRIx32") and " -- "paddr (0x%08"PRIx32") differ; usin" -+ debug("NOTE: vaddr (0x%08" PRIx32") and " -+ "paddr (0x%08" PRIx32") differ; usin" - "g vaddr\n", (uint32_t) p_vaddr, - (uint32_t)p_paddr); - } - - if (p_memsz < p_filesz) { - fprintf(stderr, "%s: memsz < filesz. TODO: how" -- " to handle this? memsz=%016"PRIx64 -- " filesz=%016"PRIx64"\n", filename, -+ " to handle this? memsz=%016" PRIx64 -+ " filesz=%016" PRIx64"\n", filename, - (uint64_t) p_memsz, (uint64_t) p_filesz); - exit(1); - } -@@ -576,7 +576,7 @@ static void file_load_elf(struct machine *m, struct me - exit(1); - } - -- debug("%i symbol entries at 0x%"PRIx64"\n", -+ debug("%i symbol entries at 0x%" PRIx64"\n", - (int) n_entries, (uint64_t) sh_offset); - - n_symbols = n_entries; -@@ -604,7 +604,7 @@ static void file_load_elf(struct machine *m, struct me - exit(1); - } - -- debug("%i bytes of symbol strings at 0x%"PRIx64"\n", -+ debug("%i bytes of symbol strings at 0x%" PRIx64"\n", - (int) sh_size, (uint64_t) sh_offset); - - symbol_strings[sh_size] = '\0'; -@@ -654,9 +654,9 @@ static void file_load_elf(struct machine *m, struct me - if (strcmp(symbol_strings + st_name, "_gp") == 0) { - debug("found _gp address: 0x"); - if (elf64) -- debug("%016"PRIx64"\n", (uint64_t)addr); -+ debug("%016" PRIx64"\n", (uint64_t)addr); - else -- debug("%08"PRIx32"\n", (uint32_t)addr); -+ debug("%08" PRIx32"\n", (uint32_t)addr); - *gpp = addr; - } - } -@@ -709,7 +709,7 @@ static void file_load_elf(struct machine *m, struct me - ((uint64_t)b[5] << 16) + ((uint64_t)b[6] << 8) + - (uint64_t)b[7]; - -- debug("entrypoint 0x%016"PRIx64", toc_base 0x%016"PRIx64"\n", -+ debug("entrypoint 0x%016" PRIx64", toc_base 0x%016" PRIx64"\n", - (uint64_t) *entrypointp, (uint64_t) toc_base); - if (tocp != NULL) - *tocp = toc_base; Index: patches/patch-src_file_file_raw_cc =================================================================== RCS file: patches/patch-src_file_file_raw_cc diff -N patches/patch-src_file_file_raw_cc --- patches/patch-src_file_file_raw_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-src_file_file_raw_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/file/file_raw.cc ---- src/file/file_raw.cc.orig -+++ src/file/file_raw.cc -@@ -111,11 +111,11 @@ static void file_load_raw(struct machine *m, struct me - vaddr += len; - } - -- debug("RAW: 0x%"PRIx64" bytes @ 0x%08"PRIx64, -+ debug("RAW: 0x%" PRIx64" bytes @ 0x%08" PRIx64, - (uint64_t) (ftello(f) - skip), (uint64_t) loadaddr); - - if (skip != 0) -- debug(" (0x%"PRIx64" bytes of header skipped)", -+ debug(" (0x%" PRIx64" bytes of header skipped)", - (uint64_t) skip); - - debug("\n"); Index: patches/patch-src_include_components_CPUDyntransComponent_h =================================================================== RCS file: patches/patch-src_include_components_CPUDyntransComponent_h diff -N patches/patch-src_include_components_CPUDyntransComponent_h --- patches/patch-src_include_components_CPUDyntransComponent_h 28 Apr 2017 07:37:00 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ -$OpenBSD: patch-src_include_components_CPUDyntransComponent_h,v 1.1 2017/04/28 07:37:00 fcambus Exp $ ---- src/include/components/CPUDyntransComponent.h.orig Sun Aug 17 10:45:13 2014 -+++ src/include/components/CPUDyntransComponent.h Mon Apr 24 15:28:54 2017 -@@ -47,9 +47,13 @@ class CPUDyntransComponent; - * f points to a function to be executed. - * arg[] contains arguments, such as pointers to registers, or immediate values. - */ -+class CPUDyntransComponent; -+struct DyntransIC; -+typedef void (*DyntransIC_t)(class CPUDyntransComponent*, struct DyntransIC*); -+ - struct DyntransIC - { -- void (*f)(CPUDyntransComponent*, DyntransIC*); -+ DyntransIC_t f; - - union { - void* p; -@@ -105,7 +109,7 @@ class CPUDyntransComponent (public) - protected: - // Implemented by specific CPU families: - virtual int GetDyntransICshift() const = 0; -- virtual void (*GetDyntransToBeTranslated())(CPUDyntransComponent* cpu, DyntransIC* ic) const = 0; -+ virtual DyntransIC_t GetDyntransToBeTranslated() const = 0; - - void DyntransToBeTranslatedBegin(struct DyntransIC*); - bool DyntransReadInstruction(uint16_t& iword); Index: patches/patch-src_include_components_M88K_CPUComponent_h =================================================================== RCS file: patches/patch-src_include_components_M88K_CPUComponent_h diff -N patches/patch-src_include_components_M88K_CPUComponent_h --- patches/patch-src_include_components_M88K_CPUComponent_h 28 Apr 2017 07:37:00 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_include_components_M88K_CPUComponent_h,v 1.1 2017/04/28 07:37:00 fcambus Exp $ ---- src/include/components/M88K_CPUComponent.h.orig Sun Aug 17 10:45:13 2014 -+++ src/include/components/M88K_CPUComponent.h Mon Apr 24 15:28:54 2017 -@@ -377,7 +377,7 @@ class M88K_CPUComponent (protected) - virtual bool FunctionTraceReturnImpl(int64_t& retval) { retval = m_r[M88K_RETURN_VALUE_REG]; return true; } - - virtual int GetDyntransICshift() const; -- virtual void (*GetDyntransToBeTranslated())(CPUDyntransComponent*, DyntransIC*) const; -+ virtual DyntransIC_t GetDyntransToBeTranslated() const ; - - virtual void ShowRegisters(GXemul* gxemul, const vector<string>& arguments) const; - Index: patches/patch-src_include_components_MIPS_CPUComponent_h =================================================================== RCS file: patches/patch-src_include_components_MIPS_CPUComponent_h diff -N patches/patch-src_include_components_MIPS_CPUComponent_h --- patches/patch-src_include_components_MIPS_CPUComponent_h 28 Apr 2017 07:37:00 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_include_components_MIPS_CPUComponent_h,v 1.1 2017/04/28 07:37:00 fcambus Exp $ ---- src/include/components/MIPS_CPUComponent.h.orig Sun Aug 17 10:45:13 2014 -+++ src/include/components/MIPS_CPUComponent.h Mon Apr 24 15:28:54 2017 -@@ -196,7 +196,7 @@ class MIPS_CPUComponent (protected) - virtual bool FunctionTraceReturnImpl(int64_t& retval); - - virtual int GetDyntransICshift() const; -- virtual void (*GetDyntransToBeTranslated())(CPUDyntransComponent*, DyntransIC*) const; -+ virtual DyntransIC_t GetDyntransToBeTranslated() const; - - virtual void ShowRegisters(GXemul* gxemul, const vector<string>& arguments) const; - Index: patches/patch-src_machines_machine_landisk_cc =================================================================== RCS file: patches/patch-src_machines_machine_landisk_cc diff -N patches/patch-src_machines_machine_landisk_cc --- patches/patch-src_machines_machine_landisk_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_machines_machine_landisk_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/machines/machine_landisk.cc ---- src/machines/machine_landisk.cc.orig -+++ src/machines/machine_landisk.cc -@@ -90,7 +90,7 @@ MACHINE_SETUP(landisk) - device_add(machine, tmpstr); - - /* rsclock0 at shb0: RS5C313 real time clock */ -- snprintf(tmpstr, sizeof(tmpstr), "rs5c313 addr=0x%"PRIx64, -+ snprintf(tmpstr, sizeof(tmpstr), "rs5c313 addr=0x%" PRIx64, - (uint64_t) SCI_DEVICE_BASE); - device_add(machine, tmpstr); - Index: patches/patch-src_machines_machine_pmax_cc =================================================================== RCS file: patches/patch-src_machines_machine_pmax_cc diff -N patches/patch-src_machines_machine_pmax_cc --- patches/patch-src_machines_machine_pmax_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,40 +0,0 @@ -$OpenBSD: patch-src_machines_machine_pmax_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/machines/machine_pmax.cc ---- src/machines/machine_pmax.cc.orig -+++ src/machines/machine_pmax.cc -@@ -660,7 +660,7 @@ abort(); - - /* KN230 mainbus / interrupt controller: */ - snprintf(tmpstr, sizeof(tmpstr), -- "kn230 addr=0x%"PRIx64, (uint64_t) KN230_SYS_ICSR); -+ "kn230 addr=0x%" PRIx64, (uint64_t) KN230_SYS_ICSR); - device_add(machine, tmpstr); - - /* -@@ -885,7 +885,7 @@ abort(); - */ - { - char tmps[300]; -- snprintf(tmps, sizeof(tmps), "cca=%"PRIx32, -+ snprintf(tmps, sizeof(tmps), "cca=%" PRIx32, - (uint32_t) (DEC_DECCCA_BASEADDR + 0xa0000000ULL)); - add_environment_string(cpu, tmps, &addr); - } -@@ -898,14 +898,14 @@ abort(); - tmps[sizeof(tmps)-1] = '\0'; - add_environment_string(cpu, tmps, &addr); - -- snprintf(tmps, sizeof(tmps), "bitmap=0x%"PRIx32, (uint32_t) -+ snprintf(tmps, sizeof(tmps), "bitmap=0x%" PRIx32, (uint32_t) - ( (DEC_MEMMAP_ADDR + sizeof(uint32_t) /* skip the - page size and point to the memmap */ - ) & 0xffffffffULL) ); - tmps[sizeof(tmps)-1] = '\0'; - add_environment_string(cpu, tmps, &addr); - -- snprintf(tmps, sizeof(tmps), "bitmaplen=0x%"PRIx32, (uint32_t) -+ snprintf(tmps, sizeof(tmps), "bitmaplen=0x%" PRIx32, (uint32_t) - ( machine->physical_ram_in_mb * 1048576 / 4096 / 8) ); - tmps[sizeof(tmps)-1] = '\0'; - add_environment_string(cpu, tmps, &addr); Index: patches/patch-src_machines_machine_test_cc =================================================================== RCS file: patches/patch-src_machines_machine_test_cc diff -N patches/patch-src_machines_machine_test_cc --- patches/patch-src_machines_machine_test_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,86 +0,0 @@ -$OpenBSD: patch-src_machines_machine_test_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/machines/machine_test.cc ---- src/machines/machine_test.cc.orig -+++ src/machines/machine_test.cc -@@ -106,37 +106,37 @@ static void default_test(struct machine *machine, stru - snprintf(base_irq, sizeof(base_irq), "%s.cpu[%i]%s", - machine->path, machine->bootstrap_cpu, end_of_base_irq); - -- snprintf(tmpstr, sizeof(tmpstr), "irqc addr=0x%"PRIx64" irq=%s", -+ snprintf(tmpstr, sizeof(tmpstr), "irqc addr=0x%" PRIx64" irq=%s", - (uint64_t) DEV_IRQC_ADDRESS, base_irq); - device_add(machine, tmpstr); - - - /* Now, add the other devices: */ - -- snprintf(tmpstr, sizeof(tmpstr), "cons addr=0x%"PRIx64 -+ snprintf(tmpstr, sizeof(tmpstr), "cons addr=0x%" PRIx64 - " irq=%s.irqc.2 in_use=%i", - (uint64_t) DEV_CONS_ADDRESS, base_irq, machine->arch != ARCH_SH); - machine->main_console_handle = (size_t)device_add(machine, tmpstr); - -- snprintf(tmpstr, sizeof(tmpstr), "mp addr=0x%"PRIx64" irq=%s%sirqc.6", -+ snprintf(tmpstr, sizeof(tmpstr), "mp addr=0x%" PRIx64" irq=%s%sirqc.6", - (uint64_t) DEV_MP_ADDRESS, - end_of_base_irq[0]? end_of_base_irq + 1 : "", - end_of_base_irq[0]? "." : ""); - device_add(machine, tmpstr); - -- snprintf(tmpstr, sizeof(tmpstr), "fbctrl addr=0x%"PRIx64, -+ snprintf(tmpstr, sizeof(tmpstr), "fbctrl addr=0x%" PRIx64, - (uint64_t) DEV_FBCTRL_ADDRESS); - device_add(machine, tmpstr); - -- snprintf(tmpstr, sizeof(tmpstr), "disk addr=0x%"PRIx64, -+ snprintf(tmpstr, sizeof(tmpstr), "disk addr=0x%" PRIx64, - (uint64_t) DEV_DISK_ADDRESS); - device_add(machine, tmpstr); - -- snprintf(tmpstr, sizeof(tmpstr), "ether addr=0x%"PRIx64" irq=%s.irqc.3", -+ snprintf(tmpstr, sizeof(tmpstr), "ether addr=0x%" PRIx64" irq=%s.irqc.3", - (uint64_t) DEV_ETHER_ADDRESS, base_irq); - device_add(machine, tmpstr); - -- snprintf(tmpstr, sizeof(tmpstr), "rtc addr=0x%"PRIx64" irq=%s.irqc.4", -+ snprintf(tmpstr, sizeof(tmpstr), "rtc addr=0x%" PRIx64" irq=%s.irqc.4", - (uint64_t) DEV_RTC_ADDRESS, base_irq); - device_add(machine, tmpstr); - } -@@ -279,29 +279,29 @@ MACHINE_SETUP(oldtestmips) - machine->machine_name = strdup("MIPS test machine"); - cpu->byte_order = EMUL_BIG_ENDIAN; - -- snprintf(tmpstr, sizeof(tmpstr), "cons addr=0x%"PRIx64" irq=%s." -+ snprintf(tmpstr, sizeof(tmpstr), "cons addr=0x%" PRIx64" irq=%s." - "cpu[%i].2", (uint64_t) DEV_CONS_ADDRESS, machine->path, - machine->bootstrap_cpu); - machine->main_console_handle = (size_t)device_add(machine, tmpstr); - -- snprintf(tmpstr, sizeof(tmpstr), "mp addr=0x%"PRIx64" irq=6", -+ snprintf(tmpstr, sizeof(tmpstr), "mp addr=0x%" PRIx64" irq=6", - (uint64_t) DEV_MP_ADDRESS); - device_add(machine, tmpstr); - -- snprintf(tmpstr, sizeof(tmpstr), "fbctrl addr=0x%"PRIx64, -+ snprintf(tmpstr, sizeof(tmpstr), "fbctrl addr=0x%" PRIx64, - (uint64_t) DEV_FBCTRL_ADDRESS); - device_add(machine, tmpstr); - -- snprintf(tmpstr, sizeof(tmpstr), "disk addr=0x%"PRIx64, -+ snprintf(tmpstr, sizeof(tmpstr), "disk addr=0x%" PRIx64, - (uint64_t) DEV_DISK_ADDRESS); - device_add(machine, tmpstr); - -- snprintf(tmpstr, sizeof(tmpstr), "ether addr=0x%"PRIx64" irq=%s." -+ snprintf(tmpstr, sizeof(tmpstr), "ether addr=0x%" PRIx64" irq=%s." - "cpu[%i].3", (uint64_t) DEV_ETHER_ADDRESS, machine->path, - machine->bootstrap_cpu); - device_add(machine, tmpstr); - -- snprintf(tmpstr, sizeof(tmpstr), "rtc addr=0x%"PRIx64" irq=%s." -+ snprintf(tmpstr, sizeof(tmpstr), "rtc addr=0x%" PRIx64" irq=%s." - "cpu[%i].4", (uint64_t) DEV_RTC_ADDRESS, machine->path, - machine->bootstrap_cpu); - device_add(machine, tmpstr); Index: patches/patch-src_main_GXemul_cc =================================================================== RCS file: patches/patch-src_main_GXemul_cc diff -N patches/patch-src_main_GXemul_cc --- patches/patch-src_main_GXemul_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_main_GXemul_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/main/GXemul.cc ---- src/main/GXemul.cc.orig -+++ src/main/GXemul.cc -@@ -515,7 +515,7 @@ string GXemul::Version() - #else - << "(unknown version)" - #endif -- << " "COPYRIGHT_MSG"\n"SECONDARY_MSG; -+ << " " COPYRIGHT_MSG"\n" SECONDARY_MSG; - - return ss.str(); - } Index: patches/patch-src_old_main_emul_cc =================================================================== RCS file: patches/patch-src_old_main_emul_cc diff -N patches/patch-src_old_main_emul_cc --- patches/patch-src_old_main_emul_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,47 +0,0 @@ -$OpenBSD: patch-src_old_main_emul_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/old_main/emul.cc ---- src/old_main/emul.cc.orig -+++ src/old_main/emul.cc -@@ -118,7 +118,7 @@ static void add_breakpoints(struct machine *m) - - m->breakpoints.addr[i] = dp; - -- debug("breakpoint %i: 0x%"PRIx64, i, dp); -+ debug("breakpoint %i: 0x%" PRIx64, i, dp); - if (string_flag) - debug(" (%s)", m->breakpoints.string[i]); - debug("\n"); -@@ -658,26 +658,26 @@ void emul_machine_setup(struct machine *m, int n_load, - - case ARCH_MIPS: - if (cpu->is_32bit) { -- debug("0x%08"PRIx32, (uint32_t) -+ debug("0x%08" PRIx32, (uint32_t) - m->cpus[m->bootstrap_cpu]->pc); - if (cpu->cd.mips.gpr[MIPS_GPR_GP] != 0) -- debug(" (gp=0x%08"PRIx32")", (uint32_t) -+ debug(" (gp=0x%08" PRIx32")", (uint32_t) - m->cpus[m->bootstrap_cpu]->cd.mips.gpr[ - MIPS_GPR_GP]); - } else { -- debug("0x%016"PRIx64, (uint64_t) -+ debug("0x%016" PRIx64, (uint64_t) - m->cpus[m->bootstrap_cpu]->pc); - if (cpu->cd.mips.gpr[MIPS_GPR_GP] != 0) -- debug(" (gp=0x%016"PRIx64")", (uint64_t) -+ debug(" (gp=0x%016" PRIx64")", (uint64_t) - cpu->cd.mips.gpr[MIPS_GPR_GP]); - } - break; - - default: - if (cpu->is_32bit) -- debug("0x%08"PRIx32, (uint32_t) cpu->pc); -+ debug("0x%08" PRIx32, (uint32_t) cpu->pc); - else -- debug("0x%016"PRIx64, (uint64_t) cpu->pc); -+ debug("0x%016" PRIx64, (uint64_t) cpu->pc); - } - debug("\n"); - Index: patches/patch-src_old_main_main_cc =================================================================== RCS file: patches/patch-src_old_main_main_cc diff -N patches/patch-src_old_main_main_cc --- patches/patch-src_old_main_main_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_old_main_main_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/old_main/main.cc ---- src/old_main/main.cc.orig -+++ src/old_main/main.cc -@@ -228,7 +228,7 @@ void internal_w(char *arg) - static void usage(int longusage) - { - -- printf("GXemul "VERSION" "COPYRIGHT_MSG"\n"SECONDARY_MSG); -+ printf("GXemul " VERSION" " COPYRIGHT_MSG"\n" SECONDARY_MSG); - printf("Read the source code and/or documentation for " - "other Copyright messages.\n"); - -@@ -837,7 +837,7 @@ int main(int argc, char *argv[]) - } - - /* Print startup message: */ -- debug("GXemul "VERSION" "COPYRIGHT_MSG"\n"SECONDARY_MSG -+ debug("GXemul " VERSION" " COPYRIGHT_MSG"\n" SECONDARY_MSG - "Read the source code and/or documentation for other Copyright " - "messages.\n\n"); - Index: patches/patch-src_old_main_memory_cc =================================================================== RCS file: patches/patch-src_old_main_memory_cc diff -N patches/patch-src_old_main_memory_cc --- patches/patch-src_old_main_memory_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,36 +0,0 @@ -$OpenBSD: patch-src_old_main_memory_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/old_main/memory.cc ---- src/old_main/memory.cc.orig -+++ src/old_main/memory.cc -@@ -378,13 +378,13 @@ void memory_device_register(struct memory *mem, const - - if (verbose >= 2) { - /* (40 bits of physical address is displayed) */ -- debug("device at 0x%010"PRIx64": %s", (uint64_t) baseaddr, -+ debug("device at 0x%010" PRIx64": %s", (uint64_t) baseaddr, - device_name); - - if (flags & (DM_DYNTRANS_OK | DM_DYNTRANS_WRITE_OK) - && (baseaddr & mem->dev_dyntrans_alignment) != 0) { - fatal("\nWARNING: Device dyntrans access, but unaligned" -- " baseaddr 0x%"PRIx64".\n", (uint64_t) baseaddr); -+ " baseaddr 0x%" PRIx64".\n", (uint64_t) baseaddr); - } - - if (flags & (DM_DYNTRANS_OK | DM_DYNTRANS_WRITE_OK)) { -@@ -627,11 +627,11 @@ void memory_warn_about_unimplemented_addr(struct cpu * - debug("} "); - } - -- fatal("paddr=0x%"PRIx64" >= physical_max; pc=", paddr); -+ fatal("paddr=0x%" PRIx64" >= physical_max; pc=", paddr); - if (cpu->is_32bit) -- fatal("0x%08"PRIx32, (uint32_t) old_pc); -+ fatal("0x%08" PRIx32, (uint32_t) old_pc); - else -- fatal("0x%016"PRIx64, (uint64_t) old_pc); -+ fatal("0x%016" PRIx64, (uint64_t) old_pc); - symbol = get_symbol_name(&cpu->machine->symbol_context, - old_pc, &offset); - fatal(" <%s> ]\n", symbol? symbol : " no symbol "); Index: patches/patch-src_old_main_settings_cc =================================================================== RCS file: patches/patch-src_old_main_settings_cc diff -N patches/patch-src_old_main_settings_cc --- patches/patch-src_old_main_settings_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -$OpenBSD: patch-src_old_main_settings_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/old_main/settings.cc ---- src/old_main/settings.cc.orig -+++ src/old_main/settings.cc -@@ -286,19 +286,19 @@ void settings_debugdump(struct settings *settings, con - - switch (settings->presentation_format[i]) { - case SETTINGS_FORMAT_DECIMAL: -- printf("%"PRIi64, value); -+ printf("%" PRIi64, value); - break; - case SETTINGS_FORMAT_HEX8: -- printf("0x%02"PRIx8, (int8_t) value); -+ printf("0x%02" PRIx8, (int8_t) value); - break; - case SETTINGS_FORMAT_HEX16: -- printf("0x%04"PRIx16, (int16_t) value); -+ printf("0x%04" PRIx16, (int16_t) value); - break; - case SETTINGS_FORMAT_HEX32: -- printf("0x%08"PRIx32, (int32_t) value); -+ printf("0x%08" PRIx32, (int32_t) value); - break; - case SETTINGS_FORMAT_HEX64: -- printf("0x%016"PRIx64, (int64_t) value); -+ printf("0x%016" PRIx64, (int64_t) value); - break; - case SETTINGS_FORMAT_BOOL: - printf(value? "true" : "false"); Index: patches/patch-src_promemul_arcbios_cc =================================================================== RCS file: patches/patch-src_promemul_arcbios_cc diff -N patches/patch-src_promemul_arcbios_cc --- patches/patch-src_promemul_arcbios_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,125 +0,0 @@ -$OpenBSD: patch-src_promemul_arcbios_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/promemul/arcbios.cc ---- src/promemul/arcbios.cc.orig -+++ src/promemul/arcbios.cc -@@ -953,7 +953,7 @@ ugly_goto: - sector, sizeof(sector)); - if (!res) { - fatal("[ arcbios_get_msdos_partition_size(): couldn't " -- "read the disk image, id %i, offset 0x%"PRIx64" ]\n", -+ "read the disk image, id %i, offset 0x%" PRIx64" ]\n", - disk_id, (uint64_t) offset); - return; - } -@@ -1236,7 +1236,7 @@ int arcbios_emul(struct cpu *cpu) - cpu->cd.mips.gpr[MIPS_GPR_V0] = (int64_t) - (int32_t) cpu->cd.mips.gpr[MIPS_GPR_V0]; - } -- debug("[ ARCBIOS GetPeer(node 0x%016"PRIx64"): 0x%016"PRIx64 -+ debug("[ ARCBIOS GetPeer(node 0x%016" PRIx64"): 0x%016" PRIx64 - " ]\n", (uint64_t) cpu->cd.mips.gpr[MIPS_GPR_A0], - (uint64_t) cpu->cd.mips.gpr[MIPS_GPR_V0]); - break; -@@ -1287,7 +1287,7 @@ int arcbios_emul(struct cpu *cpu) - cpu->cd.mips.gpr[MIPS_GPR_V0] = (int64_t) - (int32_t)cpu->cd.mips.gpr[MIPS_GPR_V0]; - } -- debug("[ ARCBIOS GetChild(node 0x%016"PRIx64"): 0x%016" -+ debug("[ ARCBIOS GetChild(node 0x%016" PRIx64"): 0x%016" - PRIx64" ]\n", (uint64_t) cpu->cd.mips.gpr[MIPS_GPR_A0], - (uint64_t) cpu->cd.mips.gpr[MIPS_GPR_V0]); - break; -@@ -1336,7 +1336,7 @@ int arcbios_emul(struct cpu *cpu) - cpu->cd.mips.gpr[MIPS_GPR_V0] = (int64_t) - (int32_t) cpu->cd.mips.gpr[MIPS_GPR_V0]; - } -- debug("[ ARCBIOS GetParent(node 0x%016"PRIx64"): 0x%016" -+ debug("[ ARCBIOS GetParent(node 0x%016" PRIx64"): 0x%016" - PRIx64" ]\n", (uint64_t) cpu->cd.mips.gpr[MIPS_GPR_A0], - (uint64_t) cpu->cd.mips.gpr[MIPS_GPR_V0]); - break; -@@ -1671,7 +1671,7 @@ int arcbios_emul(struct cpu *cpu) - arcbios_handle_to_start_and_size(machine, - handleTmp, &partition_offset, &size); - -- debug("[ ARCBIOS Write(%i,0x%08"PRIx64",%i,0x%08" -+ debug("[ ARCBIOS Write(%i,0x%08" PRIx64",%i,0x%08" - PRIx64") ]\n", (int) cpu->cd.mips.gpr[MIPS_GPR_A0], - (uint64_t) cpu->cd.mips.gpr[MIPS_GPR_A1], - (int) cpu->cd.mips.gpr[MIPS_GPR_A2], -@@ -1718,13 +1718,13 @@ int arcbios_emul(struct cpu *cpu) - break; - case 0x70: /* Seek(uint32_t handle, int64_t *ofs, - uint32_t whence): uint32_t */ -- debug("[ ARCBIOS Seek(%i,0x%08"PRIx64",%i): ", -+ debug("[ ARCBIOS Seek(%i,0x%08" PRIx64",%i): ", - (int) cpu->cd.mips.gpr[MIPS_GPR_A0], - (uint64_t)cpu->cd.mips.gpr[MIPS_GPR_A1], - (int) cpu->cd.mips.gpr[MIPS_GPR_A2]); - - if (cpu->cd.mips.gpr[MIPS_GPR_A2] != 0) { -- fatal("[ ARCBIOS Seek(%i,0x%08"PRIx64",%i): " -+ fatal("[ ARCBIOS Seek(%i,0x%08" PRIx64",%i): " - "UNIMPLEMENTED whence=%i ]\n", - (int) cpu->cd.mips.gpr[MIPS_GPR_A0], - (uint64_t) cpu->cd.mips.gpr[MIPS_GPR_A1], -@@ -1752,7 +1752,7 @@ int arcbios_emul(struct cpu *cpu) - - machine->md.arc->current_seek_offset[ - cpu->cd.mips.gpr[MIPS_GPR_A0]] = ofs; -- debug("%016"PRIx64" ]\n", (uint64_t) ofs); -+ debug("%016" PRIx64" ]\n", (uint64_t) ofs); - } - - cpu->cd.mips.gpr[MIPS_GPR_V0] = 0; /* Success. */ -@@ -2456,7 +2456,7 @@ void arcbios_init(struct machine *machine, int is64bit - machine->md.arc->console_curx = 0; - machine->md.arc->console_cury = 0; - -- arcbios_putstring(cpu, "GXemul "VERSION" ARCBIOS emulation\n"); -+ arcbios_putstring(cpu, "GXemul " VERSION" ARCBIOS emulation\n"); - - snprintf(tmpstr, sizeof(tmpstr), "%i cpu%s (%s), %i MB " - "memory\n\n", machine->ncpus, machine->ncpus > 1? "s" : "", -@@ -2609,7 +2609,7 @@ void arcbios_init(struct machine *machine, int is64bit - - system = arcbios_addchild_manual(cpu, COMPONENT_CLASS_SystemClass, - COMPONENT_TYPE_ARC, 0,1,2,0, 0xffffffff, name, 0/*ROOT*/, NULL, 0); -- debug("ARC system @ 0x%"PRIx64" (\"%s\")\n", (uint64_t) system, name); -+ debug("ARC system @ 0x%" PRIx64" (\"%s\")\n", (uint64_t) system, name); - - - /* -@@ -2720,18 +2720,18 @@ void arcbios_init(struct machine *machine, int is64bit - 0xffffffff, NULL, cpuaddr, NULL, 0); - } - -- debug("ARC cpu%i @ 0x%"PRIx64, i, (uint64_t) cpuaddr); -+ debug("ARC cpu%i @ 0x%" PRIx64, i, (uint64_t) cpuaddr); - - if (fpu != 0) -- debug(" (fpu @ 0x%"PRIx64")\n", (uint64_t) fpu); -+ debug(" (fpu @ 0x%" PRIx64")\n", (uint64_t) fpu); - else - debug("\n"); - -- debug(" picache @ 0x%"PRIx64", pdcache @ 0x%"PRIx64"\n", -+ debug(" picache @ 0x%" PRIx64", pdcache @ 0x%" PRIx64"\n", - (uint64_t) picache, (uint64_t) pdcache); - - if (cpu->cd.mips.cache_secondary >= 12) -- debug(" sdcache @ 0x%"PRIx64"\n", -+ debug(" sdcache @ 0x%" PRIx64"\n", - (uint64_t) sdcache); - - if (machine->machine_type == MACHINE_SGI) { -@@ -2740,7 +2740,7 @@ void arcbios_init(struct machine *machine, int is64bit - COMPONENT_CLASS_MemoryClass, - COMPONENT_TYPE_MemoryUnit, 0, 1, 2, 0, - 0xffffffff, "memory", cpuaddr, NULL, 0); -- debug("ARC memory @ 0x%"PRIx64"\n", (uint64_t) memory); -+ debug("ARC memory @ 0x%" PRIx64"\n", (uint64_t) memory); - } - } - Index: patches/patch-src_promemul_dec_prom_cc =================================================================== RCS file: patches/patch-src_promemul_dec_prom_cc diff -N patches/patch-src_promemul_dec_prom_cc --- patches/patch-src_promemul_dec_prom_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_promemul_dec_prom_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/promemul/dec_prom.cc ---- src/promemul/dec_prom.cc.orig -+++ src/promemul/dec_prom.cc -@@ -645,7 +645,7 @@ int decstation_prom_emul(struct cpu *cpu) - cpu->running = 0; - break; - default: -- fatal("DEC prom emulation: unknown rex() a0=0x%"PRIx64 -+ fatal("DEC prom emulation: unknown rex() a0=0x%" PRIx64 - " ('%c')\n", - (int64_t) cpu->cd.mips.gpr[MIPS_GPR_A0], - (char) cpu->cd.mips.gpr[MIPS_GPR_A0]); Index: patches/patch-src_promemul_dreamcast_cc =================================================================== RCS file: patches/patch-src_promemul_dreamcast_cc diff -N patches/patch-src_promemul_dreamcast_cc --- patches/patch-src_promemul_dreamcast_cc 22 Apr 2018 18:41:21 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_promemul_dreamcast_cc,v 1.2 2018/04/22 18:41:21 naddy Exp $ - -Index: src/promemul/dreamcast.cc ---- src/promemul/dreamcast.cc.orig -+++ src/promemul/dreamcast.cc -@@ -241,7 +241,7 @@ void dreamcast_emul(struct cpu *cpu) - // cpu->pc is the address where PROM emulation was triggered, but - // what we are after is the indirect vector that was used to fetch - // that address. -- int vectorAddr = ((cpu->pc & 0x00ffffff) - 0x100 + 0xb0) | 0x8c000000; -+ unsigned int vectorAddr = ((cpu->pc & 0x00ffffff) - 0x100 + 0xb0) | 0x8c000000; - - int r1 = cpu->cd.sh.r[1]; - int r6 = cpu->cd.sh.r[6]; -@@ -382,7 +382,7 @@ bad: - cpu_register_dump(cpu->machine, cpu, 1, 0); - printf("\n"); - fatal("[ dreamcast_emul(): unimplemented dreamcast PROM call, " -- "pc=0x%08"PRIx32" (vectorAddr=0x%08"PRIx32") ]\n", (uint32_t)cpu->pc, vectorAddr); -+ "pc=0x%08" PRIx32" (vectorAddr=0x%08" PRIx32") ]\n", (uint32_t)cpu->pc, vectorAddr); - cpu->running = 0; - return; - } Index: patches/patch-src_promemul_ps2_bios_cc =================================================================== RCS file: patches/patch-src_promemul_ps2_bios_cc diff -N patches/patch-src_promemul_ps2_bios_cc --- patches/patch-src_promemul_ps2_bios_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,38 +0,0 @@ -$OpenBSD: patch-src_promemul_ps2_bios_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/promemul/ps2_bios.cc ---- src/promemul/ps2_bios.cc.orig -+++ src/promemul/ps2_bios.cc -@@ -59,12 +59,12 @@ int playstation2_sifbios_emul(struct cpu *cpu) - cpu->cd.mips.gpr[MIPS_GPR_V0] = 0x200; /* TODO */ - break; - case 1: /* halt(int mode) */ -- debug("[ SIFBIOS halt(0x%"PRIx64") ]\n", -+ debug("[ SIFBIOS halt(0x%" PRIx64") ]\n", - (uint64_t) cpu->cd.mips.gpr[MIPS_GPR_A1]); - cpu->running = 0; - break; - case 2: /* setdve(int mode) */ -- debug("[ SIFBIOS setdve(0x%"PRIx64") ]\n", -+ debug("[ SIFBIOS setdve(0x%" PRIx64") ]\n", - (uint64_t) cpu->cd.mips.gpr[MIPS_GPR_A1]); - break; - case 3: /* putchar(int ch) */ -@@ -108,7 +108,7 @@ int playstation2_sifbios_emul(struct cpu *cpu) - cpu->cd.mips.gpr[MIPS_GPR_V0] = 1; /* TODO */ - break; - case 64: -- fatal("[ SIFBIOS SBR_IOPH_INIT(0x%"PRIx32",0x%"PRIx32",0x%" -+ fatal("[ SIFBIOS SBR_IOPH_INIT(0x%" PRIx32",0x%" PRIx32",0x%" - PRIx32"): TODO ]\n", - (uint32_t) cpu->cd.mips.gpr[MIPS_GPR_A1], - (uint32_t) cpu->cd.mips.gpr[MIPS_GPR_A2], -@@ -163,7 +163,7 @@ int playstation2_sifbios_emul(struct cpu *cpu) - cpu->cd.mips.gpr[MIPS_GPR_V0] = 0; - break; - case 65: -- fatal("[ SIFBIOS alloc iop heap(0x"PRIx32") ]\n", -+ fatal("[ SIFBIOS alloc iop heap(0x" PRIx32") ]\n", - (uint32_t)cpu->cd.mips.gpr[MIPS_GPR_A1]); - - /* Index: patches/patch-src_symbol_symbol_cc =================================================================== RCS file: patches/patch-src_symbol_symbol_cc diff -N patches/patch-src_symbol_symbol_cc --- patches/patch-src_symbol_symbol_cc 7 Apr 2018 10:55:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_symbol_symbol_cc,v 1.1 2018/04/07 10:55:54 espie Exp $ - -Index: src/symbol/symbol.cc ---- src/symbol/symbol.cc.orig -+++ src/symbol/symbol.cc -@@ -133,7 +133,7 @@ char *get_symbol_name_and_n_args(struct symbol_context - "%s", s->name); - else - snprintf(symbol_buf, SYMBOLBUF_MAX, -- "%s+0x%"PRIx64, s->name, (uint64_t) -+ "%s+0x%" PRIx64, s->name, (uint64_t) - (addr - s->addr)); - if (offset != NULL) - *offset = addr - s->addr; -@@ -157,7 +157,7 @@ char *get_symbol_name_and_n_args(struct symbol_context - "%s", s->name); - else - snprintf(symbol_buf, SYMBOLBUF_MAX, -- "%s+0x%"PRIx64, s->name, (uint64_t) -+ "%s+0x%" PRIx64, s->name, (uint64_t) - (addr - s->addr)); - - if (offset != NULL) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/emulators/gxemul/pkg/PLIST,v retrieving revision 1.15 diff -u -p -r1.15 PLIST --- pkg/PLIST 12 Oct 2014 13:26:16 -0000 1.15 +++ pkg/PLIST 5 Nov 2018 09:17:46 -0000 @@ -98,6 +98,8 @@ share/doc/gxemul/20140803-dreamcast-glte share/doc/gxemul/20140803-dreamcast-gltest.png share/doc/gxemul/20140803-serial-upload-slave-small.png share/doc/gxemul/20140803-serial-upload-slave.png +share/doc/gxemul/20180220-openbsd-luna88k-5.4-small.png +share/doc/gxemul/20180220-openbsd-luna88k-5.4.png share/doc/gxemul/RELEASE.html share/doc/gxemul/TODO.html share/doc/gxemul/configfiles.html
