545,550c545,551
< decl_code = 'uint32_t mem_word = Mem.uw;\n'
< decl_code += 'uint32_t unalign_addr = Rs + disp;\n'
< decl_code += 'uint32_t byte_offset = unalign_addr & 3;\n'
< decl_code += '#if BYTE_ORDER == BIG_ENDIAN\n'
< decl_code += '\tbyte_offset ^= 3;\n'
< decl_code += '#endif\n'
---
> decl_code = '''
> uint32_t mem_word = Mem.uw;
> uint32_t unalign_addr = Rs + disp;
> uint32_t byte_offset = unalign_addr & 3;
> if (GuestByteOrder == BigEndianByteOrder)
> byte_offset ^= 3;
> '''
566c567
< #if BYTE_ORDER == BIG_ENDIAN
---
> if (GuestByteOrder == BigEndianByteOrder)
568d568
< #endif