From 91588b3af8e026ba11c7368476cc1f3fa8c2e2b1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 11 Nov 2016 01:29:21 -0500 Subject: [PATCH] sim: mips: fix dv-tx3904cpu build error When building for mipstx39-rtems4.12 targets, some funcs use SD and CPU implicitly. Restore the defines for these to the local sd and cpu vars. This was broken by the clean up in commit d47f5b30d8481272e9480118bdcb. Reported-by: Joel Sherrill --- sim/mips/ChangeLog | 5 +++++ sim/mips/dv-tx3904cpu.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index dae00e7d34d..2b1a032b080 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,8 @@ +2016-11-11 Mike Frysinger + + * dv-tx3904cpu.c (deliver_tx3904cpu_interrupt): Define CPU to cpu + and SD to sd. + 2016-11-11 Mike Frysinger * mips.igen (check_u64): Enable for `r3900'. diff --git a/sim/mips/dv-tx3904cpu.c b/sim/mips/dv-tx3904cpu.c index da28a49a60c..4a0ec441dcd 100644 --- a/sim/mips/dv-tx3904cpu.c +++ b/sim/mips/dv-tx3904cpu.c @@ -143,6 +143,9 @@ deliver_tx3904cpu_interrupt (struct hw *me, sim_cpu *cpu = STATE_CPU (sd, 0); /* NB: fix CPU 0. */ address_word cia = CPU_PC_GET (cpu); +#define CPU cpu +#define SD sd + if (controller->pending_reset) { controller->pending_reset = 0; @@ -187,6 +190,8 @@ deliver_tx3904cpu_interrupt (struct hw *me, } } /* interrupt set */ } +#undef CPU +#undef SD } -- 2.30.2