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.

diff --git a/sim/lm32/cpu.h b/sim/lm32/cpu.h
index d7ce731b423a95710700a27e2734aaa7f4e22a42..805f1eb7d30e62b4a91c88d8a9178f75b2fb92e8 100644 (file)
--- 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 82e81988ce5437c5da96a7edafecb2988c381b8f..e0e967c4233b93efdb59b2650a4c64704ba52a87 100644 (file)
--- 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 */