On Thu, Aug 29, 2013 at 03:05:57PM -0700, Richard Henderson wrote: > In a following patch, there will be confusion between multiple "unsigned" > suffixes; rename this one so as to imply "load". > > Signed-off-by: Richard Henderson <[email protected]> > --- > include/exec/softmmu_template.h | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h > index 2fc6ea3..f9922e2 100644 > --- a/include/exec/softmmu_template.h > +++ b/include/exec/softmmu_template.h > @@ -28,19 +28,19 @@ > > #if DATA_SIZE == 8 > #define SUFFIX q > -#define USUFFIX q > +#define LSUFFIX q > #define DATA_TYPE uint64_t > #elif DATA_SIZE == 4 > #define SUFFIX l > -#define USUFFIX l > +#define LSUFFIX l > #define DATA_TYPE uint32_t > #elif DATA_SIZE == 2 > #define SUFFIX w > -#define USUFFIX uw > +#define LSUFFIX uw > #define DATA_TYPE uint16_t > #elif DATA_SIZE == 1 > #define SUFFIX b > -#define USUFFIX ub > +#define LSUFFIX ub > #define DATA_TYPE uint8_t > #else > #error unsupported data size > @@ -147,7 +147,7 @@ glue(glue(helper_ret_ld, SUFFIX), MMUSUFFIX)(CPUArchState > *env, > #endif > > haddr = addr + env->tlb_table[mmu_idx][index].addend; > - return glue(glue(ld, USUFFIX), _raw)((uint8_t *)haddr); > + return glue(glue(ld, LSUFFIX), _raw)((uint8_t *)haddr); > } > > DATA_TYPE > @@ -264,6 +264,6 @@ glue(glue(helper_st, SUFFIX), MMUSUFFIX)(CPUArchState > *env, target_ulong addr, > #undef SHIFT > #undef DATA_TYPE > #undef SUFFIX > -#undef USUFFIX > +#undef LSUFFIX > #undef DATA_SIZE > #undef ADDR_READ
Reviewed-by: Aurelien Jarno <[email protected]> -- Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net
