diff options
author | Tom Tromey <tom@tromey.com> | 2021-04-08 06:41:25 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2021-04-08 14:34:42 -0600 |
commit | 81e6e8ae407b206def2c6840736dad0dcf75eb0b (patch) | |
tree | a2c916002fdbf8fd5a3ff714edaa686146b7b38e /sim/erc32/func.c | |
parent | 83a559f7b93f2a06306e46d0d9ac094c599396ae (diff) | |
download | fsf-binutils-gdb-81e6e8ae407b206def2c6840736dad0dcf75eb0b.zip fsf-binutils-gdb-81e6e8ae407b206def2c6840736dad0dcf75eb0b.tar.gz fsf-binutils-gdb-81e6e8ae407b206def2c6840736dad0dcf75eb0b.tar.bz2 |
Do not use old-style definitions in sim
This changes all the non-generated (hand-written) code in sim to use
"new" (post-K&R) style function definitions.
2021-04-08 Tom Tromey <tom@tromey.com>
* bpf.c (bpf_def_model_init): Use new-style declaration.
sim/common/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* cgen-utils.c (RORQI, ROLQI, RORHI, ROLHI, RORSI, ROLSI): Use
new-style declaration.
sim/erc32/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* sis.c (run_sim, main): Use new-style declaration.
* interf.c (run_sim, sim_open, sim_close, sim_load)
(sim_create_inferior, sim_store_register, sim_fetch_register)
(sim_info, sim_stop_reason, flush_windows, sim_do_command): Use
new-style declaration.
* help.c (usage, gen_help): Use new-style declaration.
* func.c (batch, set_regi, set_rega, disp_reg, limcalc)
(reset_stat, show_stat, init_bpt, int_handler, init_signals)
(disp_fpu, disp_regs, disp_ctrl, disp_mem, dis_mem, event)
(init_event, set_int, advance_time, now, wait_for_irq, check_bpt)
(reset_all, sys_reset, sys_halt): Use new-style declaration.
* float.c (get_accex, clear_accex, set_fsr): Use new-style
declaration.
* exec.c (sub_cc, add_cc, log_cc, dispatch_instruction, fpexec)
(chk_asi, execute_trap, check_interrupts, init_regs): Use
new-style declaration.
* erc32.c (init_sim, reset, decode_ersr, mecparerror)
(error_mode, decode_memcfg, decode_wcr, decode_mcr, sim_halt)
(close_port, exit_sim, mec_reset, mec_intack, chk_irq, mec_irq)
(set_sfsr, mec_read, mec_write, init_stdio, restore_stdio)
(port_init, read_uart, write_uart, flush_uart, uarta_tx)
(uartb_tx, uart_rx, uart_intr, uart_irq_start, wdog_intr)
(wdog_start, rtc_intr, rtc_start, rtc_counter_read)
(rtc_scaler_set, rtc_reload_set, gpt_intr, gpt_start)
(gpt_counter_read, gpt_scaler_set, gpt_reload_set, timer_ctrl)
(memory_read, memory_write, get_mem_ptr, sis_memory_write)
(sis_memory_read): Use new-style declaration.
sim/frv/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* sim-if.c (sim_open, frv_sim_close, sim_create_inferior): Use
new-style declaration.
sim/h8300/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* compile.c (cmdline_location): Use new-style declaration.
sim/iq2000/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* sim-if.c (sim_open, sim_create_inferior): Use new-style
declaration.
* iq2000.c (fetch_str): Use new-style declaration.
sim/lm32/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* sim-if.c (sim_open, sim_create_inferior): Use new-style
declaration.
sim/m32r/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* sim-if.c (sim_open, sim_create_inferior): Use new-style
declaration.
Diffstat (limited to 'sim/erc32/func.c')
-rw-r--r-- | sim/erc32/func.c | 82 |
1 files changed, 25 insertions, 57 deletions
diff --git a/sim/erc32/func.c b/sim/erc32/func.c index 1bad6df..98217f0 100644 --- a/sim/erc32/func.c +++ b/sim/erc32/func.c @@ -70,9 +70,7 @@ static void disp_ctrl (struct pstate *sregs); static void disp_mem (uint32 addr, uint32 len); static int -batch(sregs, fname) - struct pstate *sregs; - char *fname; +batch(struct pstate *sregs, char *fname) { FILE *fp; char *lbuf = NULL; @@ -97,10 +95,7 @@ batch(sregs, fname) } void -set_regi(sregs, reg, rval) - struct pstate *sregs; - int32 reg; - uint32 rval; +set_regi(struct pstate *sregs, int32 reg, uint32 rval) { uint32 cwp; @@ -187,10 +182,7 @@ get_regi(struct pstate * sregs, int32 reg, char *buf) static void -set_rega(sregs, reg, rval) - struct pstate *sregs; - char *reg; - uint32 rval; +set_rega(struct pstate *sregs, char *reg, uint32 rval) { uint32 cwp; int32 err = 0; @@ -294,9 +286,7 @@ set_rega(sregs, reg, rval) } static void -disp_reg(sregs, reg) - struct pstate *sregs; - char *reg; +disp_reg(struct pstate *sregs, char *reg) { if (strncmp(reg, "w",1) == 0) disp_regs(sregs, VAL(®[1])); @@ -337,8 +327,7 @@ errinjstart() #endif static uint32 -limcalc (freq) - float32 freq; +limcalc (float32 freq) { uint32 unit, lim; double flim; @@ -603,8 +592,7 @@ exec_cmd(struct pstate *sregs, const char *cmd) void -reset_stat(sregs) - struct pstate *sregs; +reset_stat(struct pstate *sregs) { sregs->tottime = 0.0; sregs->pwdtime = 0; @@ -621,8 +609,7 @@ reset_stat(sregs) } void -show_stat(sregs) - struct pstate *sregs; +show_stat(struct pstate *sregs) { uint32 iinst; uint32 stime; @@ -677,8 +664,7 @@ show_stat(sregs) void -init_bpt(sregs) - struct pstate *sregs; +init_bpt(struct pstate *sregs) { sregs->bptnum = 0; sregs->histlen = 0; @@ -688,8 +674,7 @@ init_bpt(sregs) } static void -int_handler(sig) - int32 sig; +int_handler(int32 sig) { if (sig != 2) printf("\n\n Signal handler error (%d)\n\n", sig); @@ -697,7 +682,7 @@ int_handler(sig) } void -init_signals() +init_signals(void) { typedef void (*PFI) (); static PFI int_tab[2]; @@ -714,8 +699,7 @@ struct evcell evbuf[EVENT_MAX]; struct irqcell irqarr[16]; static int -disp_fpu(sregs) - struct pstate *sregs; +disp_fpu(struct pstate *sregs) { int i; @@ -741,9 +725,7 @@ disp_fpu(sregs) } static void -disp_regs(sregs,cwp) - struct pstate *sregs; - int cwp; +disp_regs(struct pstate *sregs, int cwp) { int i; @@ -770,8 +752,7 @@ static void print_insn_sparc_sis(uint32 addr, struct disassemble_info *info) } static void -disp_ctrl(sregs) - struct pstate *sregs; +disp_ctrl(struct pstate *sregs) { uint32 i; @@ -790,9 +771,7 @@ disp_ctrl(sregs) } static void -disp_mem(addr, len) - uint32 addr; - uint32 len; +disp_mem(uint32 addr, uint32 len) { uint32 i; @@ -823,10 +802,7 @@ disp_mem(addr, len) } void -dis_mem(addr, len, info) - uint32 addr; - uint32 len; - struct disassemble_info *info; +dis_mem(uint32 addr, uint32 len, struct disassemble_info *info) { uint32 i; union { @@ -846,10 +822,7 @@ dis_mem(addr, len, info) /* Add event to event queue */ void -event(cfunc, arg, delta) - void (*cfunc) (); - int32 arg; - uint64 delta; +event(void (*cfunc) (), int32 arg, uint64 delta) { struct evcell *ev1, *evins; @@ -885,7 +858,7 @@ stop_event() #endif void -init_event() +init_event(void) { int32 i; @@ -898,10 +871,7 @@ init_event() } void -set_int(level, callback, arg) - int32 level; - void (*callback) (); - int32 arg; +set_int(int32 level, void (*callback) (), int32 arg) { irqarr[level & 0x0f].callback = callback; irqarr[level & 0x0f].arg = arg; @@ -910,8 +880,7 @@ set_int(level, callback, arg) /* Advance simulator time */ void -advance_time(sregs) - struct pstate *sregs; +advance_time(struct pstate *sregs) { struct evcell *evrem; @@ -942,7 +911,7 @@ advance_time(sregs) } uint32 -now() +now(void) { return ebase.simtime; } @@ -951,7 +920,7 @@ now() /* Advance time until an external interrupt is seen */ int -wait_for_irq() +wait_for_irq(void) { struct evcell *evrem; void (*cfunc) (); @@ -980,8 +949,7 @@ wait_for_irq() } int -check_bpt(sregs) - struct pstate *sregs; +check_bpt(struct pstate *sregs) { int32 i; @@ -995,7 +963,7 @@ check_bpt(sregs) } void -reset_all() +reset_all(void) { init_event(); /* Clear event queue */ init_regs(&sregs); @@ -1006,14 +974,14 @@ reset_all() } void -sys_reset() +sys_reset(void) { reset_all(); sregs.trap = 256; /* Force fake reset trap */ } void -sys_halt() +sys_halt(void) { sregs.trap = 257; /* Force fake halt trap */ } |