From c7631501b22bb607a10396621ad4b82c357ae938 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 14 Aug 2023 20:10:10 +0930 Subject: [PATCH] sim regen preparation Regerating sim loses commit 1be79b1ebfad from sim/lm32/cpu.h, a generated file, so this patch move those declarations to sim/lm32/sim-main.h. --- sim/lm32/cpu.h | 11 ----------- sim/lm32/sim-main.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sim/lm32/cpu.h b/sim/lm32/cpu.h index d7ce731b423..805f1eb7d30 100644 --- a/sim/lm32/cpu.h +++ b/sim/lm32/cpu.h @@ -163,17 +163,6 @@ struct scache { struct argbuf argbuf; }; -/* From traps.c. */ -extern USI lm32bf_b_insn (SIM_CPU * current_cpu, USI r0, USI f_r0); -extern USI lm32bf_divu_insn (SIM_CPU * current_cpu, IADDR pc, USI r0, USI r1, USI r2); -extern USI lm32bf_modu_insn (SIM_CPU * current_cpu, IADDR pc, USI r0, USI r1, USI r2); -extern void lm32bf_wcsr_insn (SIM_CPU * current_cpu, USI f_csr, USI r1); -extern USI lm32bf_break_insn (SIM_CPU * current_cpu, IADDR pc); -extern USI lm32bf_scall_insn (SIM_CPU * current_cpu, IADDR pc); - -/* From user.c. */ -extern UINT lm32bf_user_insn (SIM_CPU * current_cpu, INT r0, INT r1, UINT imm); - /* Macros to simplify extraction, reading and semantic code. These define and assign the local vars that contain the insn's fields. */ diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h index 82e81988ce5..e0e967c4233 100644 --- a/sim/lm32/sim-main.h +++ b/sim/lm32/sim-main.h @@ -56,4 +56,15 @@ extern SIM_CORE_SIGNAL_FN lm32_core_signal; lm32_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), \ (TRANSFER), (ERROR)) +/* From traps.c. */ +extern USI lm32bf_b_insn (SIM_CPU * current_cpu, USI r0, USI f_r0); +extern USI lm32bf_divu_insn (SIM_CPU * current_cpu, IADDR pc, USI r0, USI r1, USI r2); +extern USI lm32bf_modu_insn (SIM_CPU * current_cpu, IADDR pc, USI r0, USI r1, USI r2); +extern void lm32bf_wcsr_insn (SIM_CPU * current_cpu, USI f_csr, USI r1); +extern USI lm32bf_break_insn (SIM_CPU * current_cpu, IADDR pc); +extern USI lm32bf_scall_insn (SIM_CPU * current_cpu, IADDR pc); + +/* From user.c. */ +extern UINT lm32bf_user_insn (SIM_CPU * current_cpu, INT r0, INT r1, UINT imm); + #endif /* SIM_MAIN_H */ -- 2.30.2