gwj / at91sam9263 · Commits

Commit bf6247fb7639bc3492e769791f6569d65860029b

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