folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

3b2: Fix warnings generated by older GCC

Browse source 
GCC 4.1.2 produced several warnings about inline functions.
This commit fixes those warnings.
This commit is contained in:
Seth Morabito 2017-12-17 11:32:31 -08:00
parent 65066b13bf
commit e7eaaa8550
4 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
3B2/3b2_defs.h
View file

@ -343,7 +343,6 @@ extern void increment_modep_a();
extern void increment_modep_b(); extern void increment_modep_b();
/* global symbols from the MMU */ /* global symbols from the MMU */
extern t_bool mmu_enabled();
extern void mmu_enable(); extern void mmu_enable();
extern void mmu_disable(); extern void mmu_disable();
extern uint8 read_b(uint32 va, uint8 acc); extern uint8 read_b(uint32 va, uint8 acc);

2
3B2/3b2_if.c
View file

@ -517,7 +517,7 @@ void if_write(uint32 pa, uint32 val, size_t size)
/* /*
* Compute the offset of the currently selected C/H/S * Compute the offset of the currently selected C/H/S
*/ */
SIM_INLINE uint32 if_buf_offset() static SIM_INLINE uint32 if_buf_offset()
{ {
uint32 pos; uint32 pos;

2
3B2/3b2_if.h
View file

@ -127,12 +127,12 @@ extern t_bool if_irq;
static SIM_INLINE void if_set_irq(); static SIM_INLINE void if_set_irq();
static SIM_INLINE void if_clear_irq(); static SIM_INLINE void if_clear_irq();
static SIM_INLINE void if_cancel_pending_irq(); static SIM_INLINE void if_cancel_pending_irq();
static SIM_INLINE uint32 if_buf_offset();
t_stat if_svc(UNIT *uptr); t_stat if_svc(UNIT *uptr);
t_stat if_reset(DEVICE *dptr); t_stat if_reset(DEVICE *dptr);
uint32 if_read(uint32 pa, size_t size); uint32 if_read(uint32 pa, size_t size);
void if_write(uint32 pa, uint32 val, size_t size); void if_write(uint32 pa, uint32 val, size_t size);
void if_drq_handled(); void if_drq_handled();
void if_handle_command(); void if_handle_command();
uint32 if_buf_offset();
#endif #endif

7
3B2/3b2_mmu.c
View file

@ -681,7 +681,7 @@ t_stat mmu_decode_va(uint32 va, uint8 r_acc, t_bool fc, uint32 *pa)
uint8 pd_acc; uint8 pd_acc;
t_stat sd_cached, pd_cached; t_stat sd_cached, pd_cached;
if (!mmu_enabled()) { if (!mmu_state.enabled) {
*pa = va; *pa = va;
return SCPE_OK; return SCPE_OK;
} }
@ -826,11 +826,6 @@ uint32 mmu_xlate_addr(uint32 va, uint8 r_acc)
} }
} }
SIM_INLINE t_bool mmu_enabled()
{
return mmu_state.enabled;
}
void mmu_enable() void mmu_enable()
{ {
sim_debug(EXECUTE_MSG, &mmu_dev, sim_debug(EXECUTE_MSG, &mmu_dev,