For clarity, sort methods by access size (B, W, L, Q). Fix coding style. Only code movement, no logical change.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- system/memory_ldst.c.inc | 86 ++++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 34 deletions(-) diff --git a/system/memory_ldst.c.inc b/system/memory_ldst.c.inc index 6387bb9d332..5a979ea6ac3 100644 --- a/system/memory_ldst.c.inc +++ b/system/memory_ldst.c.inc @@ -63,37 +63,46 @@ uint64_t glue(address_space_ldm_internal, SUFFIX)(ARG1_DECL, MemOp mop, return val; } -/* warning: addr must be aligned */ -static inline uint32_t glue(address_space_ldl_internal, SUFFIX)(ARG1_DECL, - MemOp mop, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) -{ - return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_32, addr, - attrs, result); -} - -/* warning: addr must be aligned */ -static inline uint64_t glue(address_space_ldq_internal, SUFFIX)(ARG1_DECL, - MemOp mop, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) -{ - return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_64, addr, - attrs, result); -} - -uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, - hwaddr addr, MemTxAttrs attrs, MemTxResult *result) +uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr, + MemTxAttrs attrs, MemTxResult *result) { return glue(address_space_ldm_internal, SUFFIX)(ARG1, MO_8, addr, attrs, result); } /* warning: addr must be aligned */ -static inline uint16_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL, - MemOp mop, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) +static inline +uint16_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL, MemOp mop, + hwaddr addr, + MemTxAttrs attrs, + MemTxResult *result) { return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_16, addr, attrs, result); } +/* warning: addr must be aligned */ +static inline +uint32_t glue(address_space_ldl_internal, SUFFIX)(ARG1_DECL, MemOp mop, + hwaddr addr, + MemTxAttrs attrs, + MemTxResult *result) +{ + return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_32, addr, + attrs, result); +} + +/* warning: addr must be aligned */ +static inline +uint64_t glue(address_space_ldq_internal, SUFFIX)(ARG1_DECL, MemOp mop, + hwaddr addr, + MemTxAttrs attrs, + MemTxResult *result) +{ + return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_64, addr, + attrs, result); +} + static inline void glue(address_space_stm_internal, SUFFIX)(ARG1_DECL, MemOp mop, hwaddr addr, uint64_t val, @@ -133,31 +142,40 @@ void glue(address_space_stm_internal, SUFFIX)(ARG1_DECL, MemOp mop, RCU_READ_UNLOCK(); } -/* warning: addr must be aligned */ -static inline void glue(address_space_stl_internal, SUFFIX)(ARG1_DECL, - MemOp mop, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result) -{ - glue(address_space_stm_internal, SUFFIX)(ARG1, mop | MO_32, addr, val, - attrs, result); -} - -void glue(address_space_stb, SUFFIX)(ARG1_DECL, - hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result) +void glue(address_space_stb, SUFFIX)(ARG1_DECL, hwaddr addr, uint8_t val, + MemTxAttrs attrs, MemTxResult *result) { glue(address_space_stm_internal, SUFFIX)(ARG1, MO_8, addr, val, attrs, result); } /* warning: addr must be aligned */ -static inline void glue(address_space_stw_internal, SUFFIX)(ARG1_DECL, - MemOp mop, hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result) +static inline +void glue(address_space_stw_internal, SUFFIX)(ARG1_DECL, MemOp mop, + hwaddr addr, uint16_t val, + MemTxAttrs attrs, + MemTxResult *result) { glue(address_space_stm_internal, SUFFIX)(ARG1, mop | MO_16, addr, val, attrs, result); } -static inline void glue(address_space_stq_internal, SUFFIX)(ARG1_DECL, - MemOp mop, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result) +/* warning: addr must be aligned */ +static inline +void glue(address_space_stl_internal, SUFFIX)(ARG1_DECL, MemOp mop, + hwaddr addr, uint32_t val, + MemTxAttrs attrs, + MemTxResult *result) +{ + glue(address_space_stm_internal, SUFFIX)(ARG1, mop | MO_32, addr, val, + attrs, result); +} + +static inline +void glue(address_space_stq_internal, SUFFIX)(ARG1_DECL, MemOp mop, + hwaddr addr, uint64_t val, + MemTxAttrs attrs, + MemTxResult *result) { glue(address_space_stm_internal, SUFFIX)(ARG1, mop | MO_64, addr, val, attrs, result); -- 2.52.0
