i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hopefully fixed the bochs debug issue

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@252 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
lillo
2002-07-16 12:39:57 +00:00
parent a5da066045
commit 2b94bc7ba9
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+1
View File
@@ -45,6 +45,7 @@ if $(WARNINGS) {
KERNEL_CCFLAGS ?= "-Wall -Wno-multichar -Wmissing-prototypes -finline -nostdinc" ; KERNEL_CCFLAGS ?= "-Wall -Wno-multichar -Wmissing-prototypes -finline -nostdinc" ;
KERNEL_CCFLAGS += "-fno-builtin -D$(OBOS_TARGET_DEFINE) " ; KERNEL_CCFLAGS += "-fno-builtin -D$(OBOS_TARGET_DEFINE) " ;
KERNEL_CCFLAGS += "-DBOCHS_E9_HACK=$(BOCHS_E9_HACK) " ;
AR = ar r ; AR = ar r ;
OPTIM = -O2 ; OPTIM = -O2 ;
configure
Vendored
+4 -11
View File
@@ -16,7 +16,7 @@ Usage: $0 <options>
options: options:
--floppy <floppy location> Specifies the location of the floppy --floppy <floppy location> Specifies the location of the floppy
(device or image). (device or image).
--debug Activates bochs serial debug emulation. --bochs-debug Activates bochs serial debug emulation.
--help Prints out this help. --help Prints out this help.
EOF EOF
} }
@@ -37,14 +37,14 @@ assertparam()
# #
platform=`uname` platform=`uname`
floppy= floppy=
debug=0 bochs_debug=0
# parse parameters # parse parameters
# #
while [ $# \> 0 ] ; do while [ $# \> 0 ] ; do
case "$1" in case "$1" in
--floppy) assertparam "$1" $#; floppy=$2; shift 2;; --floppy) assertparam "$1" $#; floppy=$2; shift 2;;
--debug) debug=1; shift 1;; --bochs-debug) bochs_debug=1; shift 1;;
--help | -h) usage; exit 0;; --help | -h) usage; exit 0;;
*) echo Invalid argument: \`$1\'; exit 1;; *) echo Invalid argument: \`$1\'; exit 1;;
esac esac
@@ -89,13 +89,6 @@ cat << EOF > BuildConfig
FLOPPY_PATH = "$floppy" ; FLOPPY_PATH = "$floppy" ;
GCC_PATH = ${GCC_PATH} ; GCC_PATH = ${GCC_PATH} ;
EOF BOCHS_E9_HACK = $bochs_debug ;
# Generate bochs debug emulation hack header
cat << EOF > headers/private/kernel/arch/bochs_hack.h
// Bochs serial debug emulation hack definition
// Note: This file has been automatically generated by configure.
#define BOCHS_E9_HACK $debug
EOF EOF
src/kernel/core/arch/x86/arch_dbg_console.c
-2
View File
@@ -10,8 +10,6 @@
#include <arch/cpu.h> #include <arch/cpu.h>
#include <arch/dbg_console.h> #include <arch/dbg_console.h>
#include <arch/bochs_hack.h>
#include <stage2.h> #include <stage2.h>
#include <string.h> #include <string.h>