Commit bf6247fb7639bc3492e769791f6569d65860029b
1 parent
c5adf6a8
Rename CONFIG_NO_DYNGEN_OP to CONFIG_DYNGEN_OP to avoid double negatives
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4412 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
6 changed files
with
29 additions
and
16 deletions
Makefile.target
| @@ -185,7 +185,7 @@ all: $(PROGS) | @@ -185,7 +185,7 @@ all: $(PROGS) | ||
| 185 | # cpu emulator library | 185 | # cpu emulator library |
| 186 | LIBOBJS=exec.o kqemu.o translate-all.o cpu-exec.o\ | 186 | LIBOBJS=exec.o kqemu.o translate-all.o cpu-exec.o\ |
| 187 | translate.o host-utils.o | 187 | translate.o host-utils.o |
| 188 | -ifndef CONFIG_NO_DYNGEN_OP | 188 | +ifdef CONFIG_DYNGEN_OP |
| 189 | LIBOBJS+=op.o | 189 | LIBOBJS+=op.o |
| 190 | endif | 190 | endif |
| 191 | # TCG code generator | 191 | # TCG code generator |
| @@ -287,7 +287,7 @@ endif | @@ -287,7 +287,7 @@ endif | ||
| 287 | 287 | ||
| 288 | # libqemu | 288 | # libqemu |
| 289 | 289 | ||
| 290 | -ifndef CONFIG_NO_DYNGEN_OP | 290 | +ifdef CONFIG_DYNGEN_OP |
| 291 | OPC_H = gen-op.h dyngen-opc.h op.h | 291 | OPC_H = gen-op.h dyngen-opc.h op.h |
| 292 | endif | 292 | endif |
| 293 | 293 |
configure
| @@ -1193,12 +1193,14 @@ echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h | @@ -1193,12 +1193,14 @@ echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h | ||
| 1193 | case "$target_cpu" in | 1193 | case "$target_cpu" in |
| 1194 | i386) | 1194 | i386) |
| 1195 | echo "TARGET_ARCH=i386" >> $config_mak | 1195 | echo "TARGET_ARCH=i386" >> $config_mak |
| 1196 | + echo "CONFIG_DYNGEN_OP=yes" >> $config_mak | ||
| 1196 | echo "#define TARGET_ARCH \"i386\"" >> $config_h | 1197 | echo "#define TARGET_ARCH \"i386\"" >> $config_h |
| 1197 | echo "#define TARGET_I386 1" >> $config_h | 1198 | echo "#define TARGET_I386 1" >> $config_h |
| 1198 | if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "i386" | 1199 | if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "i386" |
| 1199 | then | 1200 | then |
| 1200 | echo "#define USE_KQEMU 1" >> $config_h | 1201 | echo "#define USE_KQEMU 1" >> $config_h |
| 1201 | fi | 1202 | fi |
| 1203 | + echo "#define CONFIG_DYNGEN_OP 1" >> $config_h | ||
| 1202 | gcc3minver=`$cc --version 2> /dev/null| fgrep "(GCC) 3." | awk '{ print $3 }' | cut -f2 -d.` | 1204 | gcc3minver=`$cc --version 2> /dev/null| fgrep "(GCC) 3." | awk '{ print $3 }' | cut -f2 -d.` |
| 1203 | if test -n "$gcc3minver" -a $gcc3minver -gt 3 | 1205 | if test -n "$gcc3minver" -a $gcc3minver -gt 3 |
| 1204 | then | 1206 | then |
| @@ -1209,6 +1211,7 @@ case "$target_cpu" in | @@ -1209,6 +1211,7 @@ case "$target_cpu" in | ||
| 1209 | ;; | 1211 | ;; |
| 1210 | x86_64) | 1212 | x86_64) |
| 1211 | echo "TARGET_ARCH=x86_64" >> $config_mak | 1213 | echo "TARGET_ARCH=x86_64" >> $config_mak |
| 1214 | + echo "CONFIG_DYNGEN_OP=yes" >> $config_mak | ||
| 1212 | echo "#define TARGET_ARCH \"x86_64\"" >> $config_h | 1215 | echo "#define TARGET_ARCH \"x86_64\"" >> $config_h |
| 1213 | echo "#define TARGET_I386 1" >> $config_h | 1216 | echo "#define TARGET_I386 1" >> $config_h |
| 1214 | echo "#define TARGET_X86_64 1" >> $config_h | 1217 | echo "#define TARGET_X86_64 1" >> $config_h |
| @@ -1216,60 +1219,70 @@ case "$target_cpu" in | @@ -1216,60 +1219,70 @@ case "$target_cpu" in | ||
| 1216 | then | 1219 | then |
| 1217 | echo "#define USE_KQEMU 1" >> $config_h | 1220 | echo "#define USE_KQEMU 1" >> $config_h |
| 1218 | fi | 1221 | fi |
| 1222 | + echo "#define CONFIG_DYNGEN_OP 1" >> $config_h | ||
| 1219 | ;; | 1223 | ;; |
| 1220 | alpha) | 1224 | alpha) |
| 1221 | echo "TARGET_ARCH=alpha" >> $config_mak | 1225 | echo "TARGET_ARCH=alpha" >> $config_mak |
| 1226 | + echo "CONFIG_DYNGEN_OP=yes" >> $config_mak | ||
| 1222 | echo "#define TARGET_ARCH \"alpha\"" >> $config_h | 1227 | echo "#define TARGET_ARCH \"alpha\"" >> $config_h |
| 1223 | echo "#define TARGET_ALPHA 1" >> $config_h | 1228 | echo "#define TARGET_ALPHA 1" >> $config_h |
| 1229 | + echo "#define CONFIG_DYNGEN_OP 1" >> $config_h | ||
| 1224 | ;; | 1230 | ;; |
| 1225 | arm|armeb) | 1231 | arm|armeb) |
| 1226 | echo "TARGET_ARCH=arm" >> $config_mak | 1232 | echo "TARGET_ARCH=arm" >> $config_mak |
| 1227 | - echo "CONFIG_NO_DYNGEN_OP=yes" >> $config_mak | ||
| 1228 | echo "#define TARGET_ARCH \"arm\"" >> $config_h | 1233 | echo "#define TARGET_ARCH \"arm\"" >> $config_h |
| 1229 | echo "#define TARGET_ARM 1" >> $config_h | 1234 | echo "#define TARGET_ARM 1" >> $config_h |
| 1230 | - echo "#define CONFIG_NO_DYNGEN_OP 1" >> $config_h | ||
| 1231 | bflt="yes" | 1235 | bflt="yes" |
| 1232 | ;; | 1236 | ;; |
| 1233 | cris) | 1237 | cris) |
| 1234 | echo "TARGET_ARCH=cris" >> $config_mak | 1238 | echo "TARGET_ARCH=cris" >> $config_mak |
| 1235 | - echo "CONFIG_NO_DYNGEN_OP=yes" >> $config_mak | ||
| 1236 | echo "#define TARGET_ARCH \"cris\"" >> $config_h | 1239 | echo "#define TARGET_ARCH \"cris\"" >> $config_h |
| 1237 | echo "#define TARGET_CRIS 1" >> $config_h | 1240 | echo "#define TARGET_CRIS 1" >> $config_h |
| 1238 | - echo "#define CONFIG_NO_DYNGEN_OP 1" >> $config_h | ||
| 1239 | ;; | 1241 | ;; |
| 1240 | m68k) | 1242 | m68k) |
| 1241 | echo "TARGET_ARCH=m68k" >> $config_mak | 1243 | echo "TARGET_ARCH=m68k" >> $config_mak |
| 1244 | + echo "CONFIG_DYNGEN_OP=yes" >> $config_mak | ||
| 1242 | echo "#define TARGET_ARCH \"m68k\"" >> $config_h | 1245 | echo "#define TARGET_ARCH \"m68k\"" >> $config_h |
| 1243 | echo "#define TARGET_M68K 1" >> $config_h | 1246 | echo "#define TARGET_M68K 1" >> $config_h |
| 1247 | + echo "#define CONFIG_DYNGEN_OP 1" >> $config_h | ||
| 1244 | bflt="yes" | 1248 | bflt="yes" |
| 1245 | ;; | 1249 | ;; |
| 1246 | mips|mipsel) | 1250 | mips|mipsel) |
| 1247 | echo "TARGET_ARCH=mips" >> $config_mak | 1251 | echo "TARGET_ARCH=mips" >> $config_mak |
| 1252 | + echo "CONFIG_DYNGEN_OP=yes" >> $config_mak | ||
| 1248 | echo "#define TARGET_ARCH \"mips\"" >> $config_h | 1253 | echo "#define TARGET_ARCH \"mips\"" >> $config_h |
| 1249 | echo "#define TARGET_MIPS 1" >> $config_h | 1254 | echo "#define TARGET_MIPS 1" >> $config_h |
| 1250 | echo "#define TARGET_ABI_MIPSO32 1" >> $config_h | 1255 | echo "#define TARGET_ABI_MIPSO32 1" >> $config_h |
| 1256 | + echo "#define CONFIG_DYNGEN_OP 1" >> $config_h | ||
| 1251 | ;; | 1257 | ;; |
| 1252 | mipsn32|mipsn32el) | 1258 | mipsn32|mipsn32el) |
| 1253 | echo "TARGET_ARCH=mipsn32" >> $config_mak | 1259 | echo "TARGET_ARCH=mipsn32" >> $config_mak |
| 1260 | + echo "CONFIG_DYNGEN_OP=yes" >> $config_mak | ||
| 1254 | echo "#define TARGET_ARCH \"mipsn32\"" >> $config_h | 1261 | echo "#define TARGET_ARCH \"mipsn32\"" >> $config_h |
| 1255 | echo "#define TARGET_MIPS 1" >> $config_h | 1262 | echo "#define TARGET_MIPS 1" >> $config_h |
| 1256 | echo "#define TARGET_ABI_MIPSN32 1" >> $config_h | 1263 | echo "#define TARGET_ABI_MIPSN32 1" >> $config_h |
| 1264 | + echo "#define CONFIG_DYNGEN_OP 1" >> $config_h | ||
| 1257 | ;; | 1265 | ;; |
| 1258 | mips64|mips64el) | 1266 | mips64|mips64el) |
| 1259 | echo "TARGET_ARCH=mips64" >> $config_mak | 1267 | echo "TARGET_ARCH=mips64" >> $config_mak |
| 1268 | + echo "CONFIG_DYNGEN_OP=yes" >> $config_mak | ||
| 1260 | echo "#define TARGET_ARCH \"mips64\"" >> $config_h | 1269 | echo "#define TARGET_ARCH \"mips64\"" >> $config_h |
| 1261 | echo "#define TARGET_MIPS 1" >> $config_h | 1270 | echo "#define TARGET_MIPS 1" >> $config_h |
| 1262 | echo "#define TARGET_MIPS64 1" >> $config_h | 1271 | echo "#define TARGET_MIPS64 1" >> $config_h |
| 1263 | echo "#define TARGET_ABI_MIPSN64 1" >> $config_h | 1272 | echo "#define TARGET_ABI_MIPSN64 1" >> $config_h |
| 1273 | + echo "#define CONFIG_DYNGEN_OP 1" >> $config_h | ||
| 1264 | ;; | 1274 | ;; |
| 1265 | ppc) | 1275 | ppc) |
| 1266 | echo "TARGET_ARCH=ppc" >> $config_mak | 1276 | echo "TARGET_ARCH=ppc" >> $config_mak |
| 1277 | + echo "CONFIG_DYNGEN_OP=yes" >> $config_mak | ||
| 1267 | echo "#define TARGET_ARCH \"ppc\"" >> $config_h | 1278 | echo "#define TARGET_ARCH \"ppc\"" >> $config_h |
| 1268 | echo "#define TARGET_PPC 1" >> $config_h | 1279 | echo "#define TARGET_PPC 1" >> $config_h |
| 1280 | + echo "#define CONFIG_DYNGEN_OP 1" >> $config_h | ||
| 1269 | ;; | 1281 | ;; |
| 1270 | ppcemb) | 1282 | ppcemb) |
| 1271 | echo "TARGET_ARCH=ppcemb" >> $config_mak | 1283 | echo "TARGET_ARCH=ppcemb" >> $config_mak |
| 1272 | echo "TARGET_ABI_DIR=ppc" >> $config_mak | 1284 | echo "TARGET_ABI_DIR=ppc" >> $config_mak |
| 1285 | + echo "CONFIG_DYNGEN_OP=yes" >> $config_mak | ||
| 1273 | echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h | 1286 | echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h |
| 1274 | echo "#define TARGET_PPC 1" >> $config_h | 1287 | echo "#define TARGET_PPC 1" >> $config_h |
| 1275 | echo "#define TARGET_PPCEMB 1" >> $config_h | 1288 | echo "#define TARGET_PPCEMB 1" >> $config_h |
| @@ -1277,51 +1290,51 @@ case "$target_cpu" in | @@ -1277,51 +1290,51 @@ case "$target_cpu" in | ||
| 1277 | ppc64) | 1290 | ppc64) |
| 1278 | echo "TARGET_ARCH=ppc64" >> $config_mak | 1291 | echo "TARGET_ARCH=ppc64" >> $config_mak |
| 1279 | echo "TARGET_ABI_DIR=ppc" >> $config_mak | 1292 | echo "TARGET_ABI_DIR=ppc" >> $config_mak |
| 1293 | + echo "CONFIG_DYNGEN_OP=yes" >> $config_mak | ||
| 1280 | echo "#define TARGET_ARCH \"ppc64\"" >> $config_h | 1294 | echo "#define TARGET_ARCH \"ppc64\"" >> $config_h |
| 1281 | echo "#define TARGET_PPC 1" >> $config_h | 1295 | echo "#define TARGET_PPC 1" >> $config_h |
| 1282 | echo "#define TARGET_PPC64 1" >> $config_h | 1296 | echo "#define TARGET_PPC64 1" >> $config_h |
| 1297 | + echo "#define CONFIG_DYNGEN_OP 1" >> $config_h | ||
| 1283 | ;; | 1298 | ;; |
| 1284 | ppc64abi32) | 1299 | ppc64abi32) |
| 1285 | echo "TARGET_ARCH=ppc64" >> $config_mak | 1300 | echo "TARGET_ARCH=ppc64" >> $config_mak |
| 1286 | echo "TARGET_ABI_DIR=ppc" >> $config_mak | 1301 | echo "TARGET_ABI_DIR=ppc" >> $config_mak |
| 1287 | echo "TARGET_ARCH2=ppc64abi32" >> $config_mak | 1302 | echo "TARGET_ARCH2=ppc64abi32" >> $config_mak |
| 1303 | + echo "CONFIG_DYNGEN_OP=yes" >> $config_mak | ||
| 1288 | echo "#define TARGET_ARCH \"ppc64\"" >> $config_h | 1304 | echo "#define TARGET_ARCH \"ppc64\"" >> $config_h |
| 1289 | echo "#define TARGET_PPC 1" >> $config_h | 1305 | echo "#define TARGET_PPC 1" >> $config_h |
| 1290 | echo "#define TARGET_PPC64 1" >> $config_h | 1306 | echo "#define TARGET_PPC64 1" >> $config_h |
| 1291 | echo "#define TARGET_ABI32 1" >> $config_h | 1307 | echo "#define TARGET_ABI32 1" >> $config_h |
| 1308 | + echo "#define CONFIG_DYNGEN_OP 1" >> $config_h | ||
| 1292 | ;; | 1309 | ;; |
| 1293 | sh4|sh4eb) | 1310 | sh4|sh4eb) |
| 1294 | echo "TARGET_ARCH=sh4" >> $config_mak | 1311 | echo "TARGET_ARCH=sh4" >> $config_mak |
| 1312 | + echo "CONFIG_DYNGEN_OP=yes" >> $config_mak | ||
| 1295 | echo "#define TARGET_ARCH \"sh4\"" >> $config_h | 1313 | echo "#define TARGET_ARCH \"sh4\"" >> $config_h |
| 1296 | echo "#define TARGET_SH4 1" >> $config_h | 1314 | echo "#define TARGET_SH4 1" >> $config_h |
| 1315 | + echo "#define CONFIG_DYNGEN_OP 1" >> $config_h | ||
| 1297 | bflt="yes" | 1316 | bflt="yes" |
| 1298 | ;; | 1317 | ;; |
| 1299 | sparc) | 1318 | sparc) |
| 1300 | echo "TARGET_ARCH=sparc" >> $config_mak | 1319 | echo "TARGET_ARCH=sparc" >> $config_mak |
| 1301 | - echo "CONFIG_NO_DYNGEN_OP=yes" >> $config_mak | ||
| 1302 | echo "#define TARGET_ARCH \"sparc\"" >> $config_h | 1320 | echo "#define TARGET_ARCH \"sparc\"" >> $config_h |
| 1303 | echo "#define TARGET_SPARC 1" >> $config_h | 1321 | echo "#define TARGET_SPARC 1" >> $config_h |
| 1304 | - echo "#define CONFIG_NO_DYNGEN_OP 1" >> $config_h | ||
| 1305 | ;; | 1322 | ;; |
| 1306 | sparc64) | 1323 | sparc64) |
| 1307 | echo "TARGET_ARCH=sparc64" >> $config_mak | 1324 | echo "TARGET_ARCH=sparc64" >> $config_mak |
| 1308 | - echo "CONFIG_NO_DYNGEN_OP=yes" >> $config_mak | ||
| 1309 | echo "#define TARGET_ARCH \"sparc64\"" >> $config_h | 1325 | echo "#define TARGET_ARCH \"sparc64\"" >> $config_h |
| 1310 | echo "#define TARGET_SPARC 1" >> $config_h | 1326 | echo "#define TARGET_SPARC 1" >> $config_h |
| 1311 | echo "#define TARGET_SPARC64 1" >> $config_h | 1327 | echo "#define TARGET_SPARC64 1" >> $config_h |
| 1312 | - echo "#define CONFIG_NO_DYNGEN_OP 1" >> $config_h | ||
| 1313 | elfload32="yes" | 1328 | elfload32="yes" |
| 1314 | ;; | 1329 | ;; |
| 1315 | sparc32plus) | 1330 | sparc32plus) |
| 1316 | echo "TARGET_ARCH=sparc64" >> $config_mak | 1331 | echo "TARGET_ARCH=sparc64" >> $config_mak |
| 1317 | echo "TARGET_ABI_DIR=sparc" >> $config_mak | 1332 | echo "TARGET_ABI_DIR=sparc" >> $config_mak |
| 1318 | echo "TARGET_ARCH2=sparc32plus" >> $config_mak | 1333 | echo "TARGET_ARCH2=sparc32plus" >> $config_mak |
| 1319 | - echo "CONFIG_NO_DYNGEN_OP=yes" >> $config_mak | ||
| 1320 | echo "#define TARGET_ARCH \"sparc64\"" >> $config_h | 1334 | echo "#define TARGET_ARCH \"sparc64\"" >> $config_h |
| 1321 | echo "#define TARGET_SPARC 1" >> $config_h | 1335 | echo "#define TARGET_SPARC 1" >> $config_h |
| 1322 | echo "#define TARGET_SPARC64 1" >> $config_h | 1336 | echo "#define TARGET_SPARC64 1" >> $config_h |
| 1323 | echo "#define TARGET_ABI32 1" >> $config_h | 1337 | echo "#define TARGET_ABI32 1" >> $config_h |
| 1324 | - echo "#define CONFIG_NO_DYNGEN_OP 1" >> $config_h | ||
| 1325 | ;; | 1338 | ;; |
| 1326 | *) | 1339 | *) |
| 1327 | echo "Unsupported target CPU" | 1340 | echo "Unsupported target CPU" |
tcg/tcg-dyngen.c
| @@ -464,7 +464,7 @@ static inline void ia64_apply_fixes (uint8_t **gen_code_pp, | @@ -464,7 +464,7 @@ static inline void ia64_apply_fixes (uint8_t **gen_code_pp, | ||
| 464 | #endif | 464 | #endif |
| 465 | #endif | 465 | #endif |
| 466 | 466 | ||
| 467 | -#ifndef CONFIG_NO_DYNGEN_OP | 467 | +#ifdef CONFIG_DYNGEN_OP |
| 468 | 468 | ||
| 469 | #if defined __hppa__ | 469 | #if defined __hppa__ |
| 470 | struct hppa_branch_stub { | 470 | struct hppa_branch_stub { |
tcg/tcg-op.h
tcg/tcg-opc.h
| @@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
| 21 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | 21 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
| 22 | * THE SOFTWARE. | 22 | * THE SOFTWARE. |
| 23 | */ | 23 | */ |
| 24 | -#ifndef CONFIG_NO_DYNGEN_OP | 24 | +#ifdef CONFIG_DYNGEN_OP |
| 25 | #include "dyngen-opc.h" | 25 | #include "dyngen-opc.h" |
| 26 | #endif | 26 | #endif |
| 27 | 27 |
tcg/tcg.c
| @@ -1780,7 +1780,7 @@ static inline int tcg_gen_code_common(TCGContext *s, uint8_t *gen_code_buf, | @@ -1780,7 +1780,7 @@ static inline int tcg_gen_code_common(TCGContext *s, uint8_t *gen_code_buf, | ||
| 1780 | case INDEX_op_end: | 1780 | case INDEX_op_end: |
| 1781 | goto the_end; | 1781 | goto the_end; |
| 1782 | 1782 | ||
| 1783 | -#ifndef CONFIG_NO_DYNGEN_OP | 1783 | +#ifdef CONFIG_DYNGEN_OP |
| 1784 | case 0 ... INDEX_op_end - 1: | 1784 | case 0 ... INDEX_op_end - 1: |
| 1785 | /* legacy dyngen ops */ | 1785 | /* legacy dyngen ops */ |
| 1786 | #ifdef CONFIG_PROFILER | 1786 | #ifdef CONFIG_PROFILER |