diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ppc.c | 28 | ||||
| -rw-r--r-- | hw/ppc4xx_devs.c | 2 | ||||
| -rw-r--r-- | hw/ppc_prep.c | 7 |
3 files changed, 17 insertions, 20 deletions
@@ -393,8 +393,8 @@ struct ppc_tb_t { void *opaque; }; -static always_inline uint64_t cpu_ppc_get_tb (ppc_tb_t *tb_env, uint64_t vmclk, - int64_t tb_offset) +static inline uint64_t cpu_ppc_get_tb(ppc_tb_t *tb_env, uint64_t vmclk, + int64_t tb_offset) { /* TB time in tb periods */ return muldiv64(vmclk, tb_env->tb_freq, ticks_per_sec) + tb_offset; @@ -411,7 +411,7 @@ uint32_t cpu_ppc_load_tbl (CPUState *env) return tb & 0xFFFFFFFF; } -static always_inline uint32_t _cpu_ppc_load_tbu (CPUState *env) +static inline uint32_t _cpu_ppc_load_tbu(CPUState *env) { ppc_tb_t *tb_env = env->tb_env; uint64_t tb; @@ -427,9 +427,8 @@ uint32_t cpu_ppc_load_tbu (CPUState *env) return _cpu_ppc_load_tbu(env); } -static always_inline void cpu_ppc_store_tb (ppc_tb_t *tb_env, uint64_t vmclk, - int64_t *tb_offsetp, - uint64_t value) +static inline void cpu_ppc_store_tb(ppc_tb_t *tb_env, uint64_t vmclk, + int64_t *tb_offsetp, uint64_t value) { *tb_offsetp = value - muldiv64(vmclk, tb_env->tb_freq, ticks_per_sec); LOG_TB("%s: tb %016" PRIx64 " offset %08" PRIx64 "\n", @@ -447,7 +446,7 @@ void cpu_ppc_store_tbl (CPUState *env, uint32_t value) &tb_env->tb_offset, tb | (uint64_t)value); } -static always_inline void _cpu_ppc_store_tbu (CPUState *env, uint32_t value) +static inline void _cpu_ppc_store_tbu(CPUState *env, uint32_t value) { ppc_tb_t *tb_env = env->tb_env; uint64_t tb; @@ -550,8 +549,7 @@ static void cpu_ppc_tb_start (CPUState *env) } } -static always_inline uint32_t _cpu_ppc_load_decr (CPUState *env, - uint64_t next) +static inline uint32_t _cpu_ppc_load_decr(CPUState *env, uint64_t next) { ppc_tb_t *tb_env = env->tb_env; uint32_t decr; @@ -594,14 +592,14 @@ uint64_t cpu_ppc_load_purr (CPUState *env) /* When decrementer expires, * all we need to do is generate or queue a CPU exception */ -static always_inline void cpu_ppc_decr_excp (CPUState *env) +static inline void cpu_ppc_decr_excp(CPUState *env) { /* Raise it */ LOG_TB("raise decrementer exception\n"); ppc_set_irq(env, PPC_INTERRUPT_DECR, 1); } -static always_inline void cpu_ppc_hdecr_excp (CPUState *env) +static inline void cpu_ppc_hdecr_excp(CPUState *env) { /* Raise it */ LOG_TB("raise decrementer exception\n"); @@ -635,8 +633,8 @@ static void __cpu_ppc_store_decr (CPUState *env, uint64_t *nextp, (*raise_excp)(env); } -static always_inline void _cpu_ppc_store_decr (CPUState *env, uint32_t decr, - uint32_t value, int is_excp) +static inline void _cpu_ppc_store_decr(CPUState *env, uint32_t decr, + uint32_t value, int is_excp) { ppc_tb_t *tb_env = env->tb_env; @@ -654,8 +652,8 @@ static void cpu_ppc_decr_cb (void *opaque) _cpu_ppc_store_decr(opaque, 0x00000000, 0xFFFFFFFF, 1); } -static always_inline void _cpu_ppc_store_hdecr (CPUState *env, uint32_t hdecr, - uint32_t value, int is_excp) +static inline void _cpu_ppc_store_hdecr(CPUState *env, uint32_t hdecr, + uint32_t value, int is_excp) { ppc_tb_t *tb_env = env->tb_env; diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c index 8f8a44c395..9c1f7d8cff 100644 --- a/hw/ppc4xx_devs.c +++ b/hw/ppc4xx_devs.c @@ -377,7 +377,7 @@ static uint32_t sdram_bcr (target_phys_addr_t ram_base, return bcr; } -static always_inline target_phys_addr_t sdram_base (uint32_t bcr) +static inline target_phys_addr_t sdram_base(uint32_t bcr) { return bcr & 0xFF800000; } diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 97190a2b7b..3dae4588dd 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -115,7 +115,7 @@ static void _PPC_intack_write (void *opaque, // printf("%s: 0x" PADDRX " => 0x%08" PRIx32 "\n", __func__, addr, value); } -static always_inline uint32_t _PPC_intack_read (target_phys_addr_t addr) +static inline uint32_t _PPC_intack_read(target_phys_addr_t addr) { uint32_t retval = 0; @@ -426,9 +426,8 @@ static uint32_t PREP_io_800_readb (void *opaque, uint32_t addr) return retval; } -static always_inline target_phys_addr_t prep_IO_address (sysctrl_t *sysctrl, - target_phys_addr_t - addr) +static inline target_phys_addr_t prep_IO_address(sysctrl_t *sysctrl, + target_phys_addr_t addr) { if (sysctrl->contiguous_map == 0) { /* 64 KB contiguous space for IOs */ |