rename lexel.l -> bx_lexel.l and parser.y -> bx_parser.y to avoid com…

…pilation issues due to name collision enable 3dnow on configure only if cpu_level >= 5
bochs-emu · Jan 22, 2025 · 50cd319 · 50cd319
1 parent e998938
commit 50cd319
Show file tree

Hide file tree

Showing 10 changed files with 536 additions and 523 deletions.
diff --git a/bochs/.conf.gh-build-test b/bochs/.conf.gh-build-test
@@ -55,6 +55,7 @@ case $which_config in
     ./configure \
       --enable-cpu-level=3 \
       --disable-fpu \
+      --disable-3dnow \
       --disable-pci \
       --with-nogui
     ;;

diff --git a/bochs/bx_debug/Makefile.in b/bochs/bx_debug/Makefile.in
@@ -55,8 +55,8 @@ BX_OBJS = \
   linux.o \
 
 BX_PARSER_OBJS = \
-  parser.o \
-  lexer.o
+  bx_parser.o \
+  bx_lexer.o
 
 BX_INCLUDES = debug.h
 
@@ -89,31 +89,31 @@ dist-clean: clean
 	@RMCOMMAND@ Makefile
 
 parse-clean:
-	@RMCOMMAND@ -f  lexer.c
-	@RMCOMMAND@ -f  parser.cc
-	@RMCOMMAND@ -f  parser.h
+	@RMCOMMAND@ -f  bx_lexer.c
+	@RMCOMMAND@ -f  bx_parser.cc
+	@RMCOMMAND@ -f  bx_parser.h
 
 dbg_main.o: debug.h
 
-@NO_FLEX_YACC@parser.cc: parser.y
-@NO_FLEX_YACC@	@/bin/rm -f y.tab.c parser.cc
-@NO_FLEX_YACC@	@/bin/rm -f y.tab.h parser.h
+@NO_FLEX_YACC@bx_parser.cc: bx_parser.y
+@NO_FLEX_YACC@	@/bin/rm -f y.tab.c bx_parser.cc
+@NO_FLEX_YACC@	@/bin/rm -f y.tab.h bx_parser.h
 @NO_FLEX_YACC@	$(YACC) -p bx -d $<
-@NO_FLEX_YACC@	@/bin/mv -f y.tab.c parser.cc
-@NO_FLEX_YACC@	@/bin/mv -f y.tab.h parser.h
-@NO_FLEX_YACC@	@sed -i s/extern\ YYSTYPE/extern\ \"C\"\ YYSTYPE/ parser.cc
-@NO_FLEX_YACC@	@echo '#endif  /* if BX_DEBUGGER */' >> parser.cc
-@NO_FLEX_YACC@	@echo '/* The #endif is appended by the makefile after running yacc. */' >> parser.cc
+@NO_FLEX_YACC@	@/bin/mv -f y.tab.c bx_parser.cc
+@NO_FLEX_YACC@	@/bin/mv -f y.tab.h bx_parser.h
+@NO_FLEX_YACC@	@sed -i s/extern\ YYSTYPE/extern\ \"C\"\ YYSTYPE/ bx_parser.cc
+@NO_FLEX_YACC@	@echo '#endif  /* if BX_DEBUGGER */' >> bx_parser.cc
+@NO_FLEX_YACC@	@echo '/* The #endif is appended by the makefile after running yacc. */' >> bx_parser.cc
 
-@NO_FLEX_YACC@lexer.c: lexer.l
-@NO_FLEX_YACC@	$(LEX) -Pbx -t $< > lexer.c
+@NO_FLEX_YACC@bx_lexer.c: bx_lexer.l
+@NO_FLEX_YACC@	$(LEX) -Pbx -t $< > bx_lexer.c
 
 ###########################################
 # dependencies generated by
 #  gcc -MM -I. -I.. -I../instrument/stubs *.c  *.cc | sed 's/\.cc/.@CPP_SUFFIX@/g'
 ###########################################
-lexer.o: lexer.c debug.h ../config.h ../osdep.h ../cpu/decoder/decoder.h \
- ../cpu/decoder/features.h parser.h
+bx_lexer.o: bx_lexer.c debug.h ../config.h ../osdep.h ../cpu/decoder/decoder.h \
+ ../cpu/decoder/features.h bx_parser.h
 dbg_breakpoints.o: dbg_breakpoints.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
  ../logio.h ../misc/bswap.h debug.h ../config.h ../osdep.h \
  ../cpu/decoder/decoder.h ../cpu/decoder/features.h
@@ -139,7 +139,7 @@ linux.o: linux.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../logio.h \
  ../cpu/descriptor.h ../cpu/decoder/instr.h ../cpu/lazy_flags.h \
  ../cpu/tlb.h ../cpu/icache.h ../cpu/xmm.h ../cpu/vmx.h \
  ../cpu/vmx_ctrls.h ../cpu/access.h syscalls-linux.h
-parser.o: parser.@CPP_SUFFIX@ debug.h ../config.h ../osdep.h \
+bx_parser.o: bx_parser.@CPP_SUFFIX@ debug.h ../config.h ../osdep.h \
  ../cpu/decoder/decoder.h ../cpu/decoder/features.h
 symbols.o: symbols.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../logio.h \
  ../misc/bswap.h debug.h ../config.h ../osdep.h ../cpu/decoder/decoder.h \