Revision 3b2aba2f

b/tci.c
63 63

  
64 64
static tcg_target_ulong tci_reg[TCG_TARGET_NB_REGS];
65 65

  
66
#if !defined(CONFIG_TCG_PASS_AREG0)
67
# define helper_ldb_mmu(env, addr, mmu_idx) __ldb_mmu(addr, mmu_idx)
68
# define helper_ldw_mmu(env, addr, mmu_idx) __ldw_mmu(addr, mmu_idx)
69
# define helper_ldl_mmu(env, addr, mmu_idx) __ldl_mmu(addr, mmu_idx)
70
# define helper_ldq_mmu(env, addr, mmu_idx) __ldq_mmu(addr, mmu_idx)
71
# define helper_stb_mmu(env, addr, val, mmu_idx) __stb_mmu(addr, val, mmu_idx)
72
# define helper_stw_mmu(env, addr, val, mmu_idx) __stw_mmu(addr, val, mmu_idx)
73
# define helper_stl_mmu(env, addr, val, mmu_idx) __stl_mmu(addr, val, mmu_idx)
74
# define helper_stq_mmu(env, addr, val, mmu_idx) __stq_mmu(addr, val, mmu_idx)
75
#endif /* !CONFIG_TCG_PASS_AREG0 */
76

  
66 77
static tcg_target_ulong tci_read_reg(TCGReg index)
67 78
{
68 79
    assert(index < ARRAY_SIZE(tci_reg));
......
1049 1060
            t0 = *tb_ptr++;
1050 1061
            taddr = tci_read_ulong(&tb_ptr);
1051 1062
#ifdef CONFIG_SOFTMMU
1052
            tmp8 = __ldb_mmu(taddr, tci_read_i(&tb_ptr));
1063
            tmp8 = helper_ldb_mmu(env, taddr, tci_read_i(&tb_ptr));
1053 1064
#else
1054 1065
            host_addr = (tcg_target_ulong)taddr;
1055 1066
            assert(taddr == host_addr);
......
1061 1072
            t0 = *tb_ptr++;
1062 1073
            taddr = tci_read_ulong(&tb_ptr);
1063 1074
#ifdef CONFIG_SOFTMMU
1064
            tmp8 = __ldb_mmu(taddr, tci_read_i(&tb_ptr));
1075
            tmp8 = helper_ldb_mmu(env, taddr, tci_read_i(&tb_ptr));
1065 1076
#else
1066 1077
            host_addr = (tcg_target_ulong)taddr;
1067 1078
            assert(taddr == host_addr);
......
1073 1084
            t0 = *tb_ptr++;
1074 1085
            taddr = tci_read_ulong(&tb_ptr);
1075 1086
#ifdef CONFIG_SOFTMMU
1076
            tmp16 = __ldw_mmu(taddr, tci_read_i(&tb_ptr));
1087
            tmp16 = helper_ldw_mmu(env, taddr, tci_read_i(&tb_ptr));
1077 1088
#else
1078 1089
            host_addr = (tcg_target_ulong)taddr;
1079 1090
            assert(taddr == host_addr);
......
1085 1096
            t0 = *tb_ptr++;
1086 1097
            taddr = tci_read_ulong(&tb_ptr);
1087 1098
#ifdef CONFIG_SOFTMMU
1088
            tmp16 = __ldw_mmu(taddr, tci_read_i(&tb_ptr));
1099
            tmp16 = helper_ldw_mmu(env, taddr, tci_read_i(&tb_ptr));
1089 1100
#else
1090 1101
            host_addr = (tcg_target_ulong)taddr;
1091 1102
            assert(taddr == host_addr);
......
1098 1109
            t0 = *tb_ptr++;
1099 1110
            taddr = tci_read_ulong(&tb_ptr);
1100 1111
#ifdef CONFIG_SOFTMMU
1101
            tmp32 = __ldl_mmu(taddr, tci_read_i(&tb_ptr));
1112
            tmp32 = helper_ldl_mmu(env, taddr, tci_read_i(&tb_ptr));
1102 1113
#else
1103 1114
            host_addr = (tcg_target_ulong)taddr;
1104 1115
            assert(taddr == host_addr);
......
1110 1121
            t0 = *tb_ptr++;
1111 1122
            taddr = tci_read_ulong(&tb_ptr);
1112 1123
#ifdef CONFIG_SOFTMMU
1113
            tmp32 = __ldl_mmu(taddr, tci_read_i(&tb_ptr));
1124
            tmp32 = helper_ldl_mmu(env, taddr, tci_read_i(&tb_ptr));
1114 1125
#else
1115 1126
            host_addr = (tcg_target_ulong)taddr;
1116 1127
            assert(taddr == host_addr);
......
1123 1134
            t0 = *tb_ptr++;
1124 1135
            taddr = tci_read_ulong(&tb_ptr);
1125 1136
#ifdef CONFIG_SOFTMMU
1126
            tmp32 = __ldl_mmu(taddr, tci_read_i(&tb_ptr));
1137
            tmp32 = helper_ldl_mmu(env, taddr, tci_read_i(&tb_ptr));
1127 1138
#else
1128 1139
            host_addr = (tcg_target_ulong)taddr;
1129 1140
            assert(taddr == host_addr);
......
1138 1149
#endif
1139 1150
            taddr = tci_read_ulong(&tb_ptr);
1140 1151
#ifdef CONFIG_SOFTMMU
1141
            tmp64 = __ldq_mmu(taddr, tci_read_i(&tb_ptr));
1152
            tmp64 = helper_ldq_mmu(env, taddr, tci_read_i(&tb_ptr));
1142 1153
#else
1143 1154
            host_addr = (tcg_target_ulong)taddr;
1144 1155
            assert(taddr == host_addr);
......
1154 1165
            taddr = tci_read_ulong(&tb_ptr);
1155 1166
#ifdef CONFIG_SOFTMMU
1156 1167
            t2 = tci_read_i(&tb_ptr);
1157
            __stb_mmu(taddr, t0, t2);
1168
            helper_stb_mmu(env, taddr, t0, t2);
1158 1169
#else
1159 1170
            host_addr = (tcg_target_ulong)taddr;
1160 1171
            assert(taddr == host_addr);
......
1166 1177
            taddr = tci_read_ulong(&tb_ptr);
1167 1178
#ifdef CONFIG_SOFTMMU
1168 1179
            t2 = tci_read_i(&tb_ptr);
1169
            __stw_mmu(taddr, t0, t2);
1180
            helper_stw_mmu(env, taddr, t0, t2);
1170 1181
#else
1171 1182
            host_addr = (tcg_target_ulong)taddr;
1172 1183
            assert(taddr == host_addr);
......
1178 1189
            taddr = tci_read_ulong(&tb_ptr);
1179 1190
#ifdef CONFIG_SOFTMMU
1180 1191
            t2 = tci_read_i(&tb_ptr);
1181
            __stl_mmu(taddr, t0, t2);
1192
            helper_stl_mmu(env, taddr, t0, t2);
1182 1193
#else
1183 1194
            host_addr = (tcg_target_ulong)taddr;
1184 1195
            assert(taddr == host_addr);
......
1190 1201
            taddr = tci_read_ulong(&tb_ptr);
1191 1202
#ifdef CONFIG_SOFTMMU
1192 1203
            t2 = tci_read_i(&tb_ptr);
1193
            __stq_mmu(taddr, tmp64, t2);
1204
            helper_stq_mmu(env, taddr, tmp64, t2);
1194 1205
#else
1195 1206
            host_addr = (tcg_target_ulong)taddr;
1196 1207
            assert(taddr == host_addr);

Also available in: Unified diff