vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

The debug version of Stage 2 is removed

Browse source
This commit is contained in:
okuji 1999-06-06 01:40:59 +00:00
parent 5f44ad81f0
commit 0d6c15713b
22 changed files with 157 additions and 510 deletions
Download patch file Download diff file Expand all files Collapse all files

27
ChangeLog
View file

@ -1,3 +1,30 @@
1999-06-06 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
The debug version of Stage 2 is removed.
* shared_src/cmdline.c: The imps code is now defined if GRUB_UTIL
is not defined, but not if DEBUG.
(debug): New global variable.
(commands): All commands are always enabled, and added "debug".
(debug_fs_print_func): Defined unconditionally.
(debug_fs_blocklist_func): If DEBUG is true, then call printf.
(enter_cmdline): Handle "testload", "read", "fstest",
"impsprobe" and "displaymem" unconditionally, and added "debug"
handling.
[GRUB_UTIL]: If a command is impsprobe, just fails.
* shared_src/disk_io.c (devread) [!STAGE1_5]: If DEBUG_FS and
DEBUG are true, then call printf.
* shared_src/asm.S (patch_code): Defined unconditionally.
(patch_code_end): Likewise.
* stage1/stage1.S (firstlist) [!FFS_STAGE1_5]: Increase the
number of sectors to 90, because Stage 2 is larger than 80
sectors.
* configure.in: The option --enable-debug is removed, and do
not output "stage2_debug/Makefile".
* Makefile.am (SUBDIRS): stage2_debug is removed.
* stage2_debug/Makefile.am: Deleted.
* stage2_debug/Makefile.in: Likewise.
1999-06-02 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> 1999-06-02 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* grub/main.c (verbose): New variable. * grub/main.c (verbose): New variable.

2
Makefile.am
View file

@ -1,4 +1,4 @@
SUBDIRS = grub stage1 stage2 stage2_debug \ SUBDIRS = grub stage1 stage2 \
e2fs_stage1_5 fat_stage1_5 ffs_stage1_5 \ e2fs_stage1_5 fat_stage1_5 ffs_stage1_5 \
docs shared_src debian docs shared_src debian
DISTCLEANFILES = ssrcrules.mk DISTCLEANFILES = ssrcrules.mk

3
Makefile.in
View file

@ -70,10 +70,9 @@ VERSION = @VERSION@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
sbingrub = @sbingrub@ sbingrub = @sbingrub@
stage2debug = @stage2debug@
SUBDIRS = grub stage1 stage2 stage2_debug \ SUBDIRS = grub stage1 stage2 \
e2fs_stage1_5 fat_stage1_5 ffs_stage1_5 \ e2fs_stage1_5 fat_stage1_5 ffs_stage1_5 \
docs shared_src debian docs shared_src debian

2
README
View file

@ -62,7 +62,7 @@ Just hit enter when CVS prompts you for a password.
in the stage1, then be sure your blocklist is big enough. The in the stage1, then be sure your blocklist is big enough. The
automated install will generally do this for you, it's just when automated install will generally do this for you, it's just when
dropping it on a raw floppy, you get the default compiled in, which dropping it on a raw floppy, you get the default compiled in, which
is 512 * 80 disk sectors, or 40960 bytes. is 512 * 90 disk sectors, or 46080 bytes.
- For the FFS stage1.5, if you want to fit into the "bootloader" area - For the FFS stage1.5, if you want to fit into the "bootloader" area
of an FFS partition, it cannot be larger than 512 * 14 disk sectors, of an FFS partition, it cannot be larger than 512 * 14 disk sectors,

102
configure vendored
View file

@ -13,8 +13,6 @@ ac_default_prefix=/usr/local
# Any additions from configure.in: # Any additions from configure.in:
ac_help="$ac_help ac_help="$ac_help
--enable-sbin-grub build /sbin/grub command-line utility" --enable-sbin-grub build /sbin/grub command-line utility"
ac_help="$ac_help
--enable-debug build debugging version of stage2"
# Initialize some variables set by options. # Initialize some variables set by options.
# The variables have the same names as the options, with # The variables have the same names as the options, with
@ -556,7 +554,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:560: checking for a BSD compatible install" >&5 echo "configure:558: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if eval "test \"\${ac_cv_path_install+set}\" = set"; then if eval "test \"\${ac_cv_path_install+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -613,7 +611,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
echo "configure:617: checking whether build environment is sane" >&5 echo "configure:615: checking whether build environment is sane" >&5
# Just in case # Just in case
sleep 1 sleep 1
echo timestamp > conftestfile echo timestamp > conftestfile
@ -670,7 +668,7 @@ test "$program_suffix" != NONE &&
test "$program_transform_name" = "" && program_transform_name="s,x,x," test "$program_transform_name" = "" && program_transform_name="s,x,x,"
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:674: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo "configure:672: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -719,7 +717,7 @@ EOF
missing_dir=`cd $ac_aux_dir && pwd` missing_dir=`cd $ac_aux_dir && pwd`
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
echo "configure:723: checking for working aclocal" >&5 echo "configure:721: checking for working aclocal" >&5
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
@ -732,7 +730,7 @@ else
fi fi
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
echo "configure:736: checking for working autoconf" >&5 echo "configure:734: checking for working autoconf" >&5
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
@ -745,7 +743,7 @@ else
fi fi
echo $ac_n "checking for working automake""... $ac_c" 1>&6 echo $ac_n "checking for working automake""... $ac_c" 1>&6
echo "configure:749: checking for working automake" >&5 echo "configure:747: checking for working automake" >&5
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
@ -758,7 +756,7 @@ else
fi fi
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
echo "configure:762: checking for working autoheader" >&5 echo "configure:760: checking for working autoheader" >&5
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
@ -771,7 +769,7 @@ else
fi fi
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
echo "configure:775: checking for working makeinfo" >&5 echo "configure:773: checking for working makeinfo" >&5
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
@ -788,7 +786,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:792: checking for $ac_word" >&5 echo "configure:790: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_TAR+set}\" = set"; then if eval "test \"\${ac_cv_prog_TAR+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -828,7 +826,7 @@ fi
echo $ac_n "checking host system type""... $ac_c" 1>&6 echo $ac_n "checking host system type""... $ac_c" 1>&6
echo "configure:832: checking host system type" >&5 echo "configure:830: checking host system type" >&5
if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then
# Make sure we can run config.sub. # Make sure we can run config.sub.
@ -888,22 +886,13 @@ fi
stage2debug=
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
enableval="$enable_debug"
test "x$enableval" = xno || stage2debug=stage2_debug
fi
# #
# Programs # Programs
# #
echo $ac_n "checking build system type""... $ac_c" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6
echo "configure:907: checking build system type" >&5 echo "configure:896: checking build system type" >&5
if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then
# Make sure we can run config.sub. # Make sure we can run config.sub.
@ -950,7 +939,7 @@ fi
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2 set dummy ${ac_tool_prefix}gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:954: checking for $ac_word" >&5 echo "configure:943: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -982,7 +971,7 @@ fi
# Extract the first word of "gcc", so it can be a program name with args. # Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2 set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:986: checking for $ac_word" >&5 echo "configure:975: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1012,7 +1001,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args. # Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2 set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1016: checking for $ac_word" >&5 echo "configure:1005: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1063,7 +1052,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args. # Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2 set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1067: checking for $ac_word" >&5 echo "configure:1056: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1095,7 +1084,7 @@ fi
fi fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6
echo "configure:1099: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 echo "configure:1088: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5
ac_ext=c ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@ -1106,12 +1095,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 1110 "configure" #line 1099 "configure"
#include "confdefs.h" #include "confdefs.h"
main(){return(0);} main(){return(0);}
EOF EOF
if { (eval echo configure:1115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler. # If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then if (./conftest; exit) 2>/dev/null; then
@ -1137,12 +1126,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
echo "configure:1141: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "configure:1130: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
echo "configure:1146: checking whether we are using GNU C" >&5 echo "configure:1135: checking whether we are using GNU C" >&5
if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1151,7 +1140,7 @@ else
yes; yes;
#endif #endif
EOF EOF
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes ac_cv_prog_gcc=yes
else else
ac_cv_prog_gcc=no ac_cv_prog_gcc=no
@ -1170,7 +1159,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
CFLAGS= CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
echo "configure:1174: checking whether ${CC-cc} accepts -g" >&5 echo "configure:1163: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1208,7 +1197,7 @@ CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wunused"
# Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
set dummy ${ac_tool_prefix}ld; ac_word=$2 set dummy ${ac_tool_prefix}ld; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1212: checking for $ac_word" >&5 echo "configure:1201: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_LD+set}\" = set"; then if eval "test \"\${ac_cv_prog_LD+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1240,7 +1229,7 @@ fi
# Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args.
set dummy ${ac_tool_prefix}objcopy; ac_word=$2 set dummy ${ac_tool_prefix}objcopy; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1244: checking for $ac_word" >&5 echo "configure:1233: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_OBJCOPY+set}\" = set"; then if eval "test \"\${ac_cv_prog_OBJCOPY+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1273,7 +1262,7 @@ fi
# Defined in acinclude.m4. # Defined in acinclude.m4.
echo $ac_n "checking symbol names produced by ${CC-cc}""... $ac_c" 1>&6 echo $ac_n "checking symbol names produced by ${CC-cc}""... $ac_c" 1>&6
echo "configure:1277: checking symbol names produced by ${CC-cc}" >&5 echo "configure:1266: checking symbol names produced by ${CC-cc}" >&5
if eval "test \"\${grub_cv_asm_ext_c+set}\" = set"; then if eval "test \"\${grub_cv_asm_ext_c+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1286,7 +1275,7 @@ func (int *list)
} }
EOF EOF
if { ac_try='${CC-cc} -S conftest.c'; { (eval echo configure:1290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then : if { ac_try='${CC-cc} -S conftest.c'; { (eval echo configure:1279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then :
else else
{ echo "configure: error: ${CC-cc} failed to produce assembly code" 1>&2; exit 1; } { echo "configure: error: ${CC-cc} failed to produce assembly code" 1>&2; exit 1; }
fi fi
@ -1315,7 +1304,7 @@ EOF
echo $ac_n "checking whether ${OBJCOPY} works for absolute addresses""... $ac_c" 1>&6 echo $ac_n "checking whether ${OBJCOPY} works for absolute addresses""... $ac_c" 1>&6
echo "configure:1319: checking whether ${OBJCOPY} works for absolute addresses" >&5 echo "configure:1308: checking whether ${OBJCOPY} works for absolute addresses" >&5
if eval "test \"\${grub_cv_prog_objcopy_absolute+set}\" = set"; then if eval "test \"\${grub_cv_prog_objcopy_absolute+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1327,21 +1316,21 @@ blah (void)
} }
EOF EOF
if { (eval echo configure:1331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then : if { (eval echo configure:1320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then :
else else
{ echo "configure: error: ${CC-cc} cannot compile C source code" 1>&2; exit 1; } { echo "configure: error: ${CC-cc} cannot compile C source code" 1>&2; exit 1; }
fi fi
grub_cv_prog_objcopy_absolute=yes grub_cv_prog_objcopy_absolute=yes
for link_addr in 2000 8000 7C00; do for link_addr in 2000 8000 7C00; do
if { ac_try='${LD-ld} -N -Ttext $link_addr conftest.o -o conftest.exec'; { (eval echo configure:1337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : if { ac_try='${LD-ld} -N -Ttext $link_addr conftest.o -o conftest.exec'; { (eval echo configure:1326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
else else
{ echo "configure: error: ${LD-ld} cannot link at address $link_addr" 1>&2; exit 1; } { echo "configure: error: ${LD-ld} cannot link at address $link_addr" 1>&2; exit 1; }
fi fi
if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
else else
{ echo "configure: error: ${OBJCOPY-objcopy} cannot create binary files" 1>&2; exit 1; } { echo "configure: error: ${OBJCOPY-objcopy} cannot create binary files" 1>&2; exit 1; }
fi fi
if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
mv -f conftest conftest.old mv -f conftest conftest.old
else else
grub_cv_prog_objcopy_absolute=no grub_cv_prog_objcopy_absolute=no
@ -1358,7 +1347,7 @@ fi
echo $ac_n "checking for .code16 addr32 assembler support""... $ac_c" 1>&6 echo $ac_n "checking for .code16 addr32 assembler support""... $ac_c" 1>&6
echo "configure:1362: checking for .code16 addr32 assembler support" >&5 echo "configure:1351: checking for .code16 addr32 assembler support" >&5
if eval "test \"\${grub_cv_asm_addr32+set}\" = set"; then if eval "test \"\${grub_cv_asm_addr32+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1368,7 +1357,7 @@ l1: addr32
movb %al, l1 movb %al, l1
EOF EOF
if { ac_try='${CC-cc} -c conftest.s'; { (eval echo configure:1372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then if { ac_try='${CC-cc} -c conftest.s'; { (eval echo configure:1361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then
grub_cv_asm_addr32=yes grub_cv_asm_addr32=yes
else else
grub_cv_asm_addr32=no grub_cv_asm_addr32=no
@ -1384,7 +1373,7 @@ fi
# Check for curses libraries if we are building /sbin/grub. # Check for curses libraries if we are building /sbin/grub.
if test -n "$sbingrub"; then if test -n "$sbingrub"; then
echo $ac_n "checking for getch in -lncurses""... $ac_c" 1>&6 echo $ac_n "checking for getch in -lncurses""... $ac_c" 1>&6
echo "configure:1388: checking for getch in -lncurses" >&5 echo "configure:1377: checking for getch in -lncurses" >&5
ac_lib_var=`echo ncurses'_'getch | sed 'y%./+-%__p_%'` ac_lib_var=`echo ncurses'_'getch | sed 'y%./+-%__p_%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -1392,7 +1381,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lncurses $LIBS" LIBS="-lncurses $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1396 "configure" #line 1385 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -1403,7 +1392,7 @@ int main() {
getch() getch()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -1426,7 +1415,7 @@ EOF
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for getch in -lcurses""... $ac_c" 1>&6 echo $ac_n "checking for getch in -lcurses""... $ac_c" 1>&6
echo "configure:1430: checking for getch in -lcurses" >&5 echo "configure:1419: checking for getch in -lcurses" >&5
ac_lib_var=`echo curses'_'getch | sed 'y%./+-%__p_%'` ac_lib_var=`echo curses'_'getch | sed 'y%./+-%__p_%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -1434,7 +1423,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lcurses $LIBS" LIBS="-lcurses $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1438 "configure" #line 1427 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -1445,7 +1434,7 @@ int main() {
getch() getch()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -1618,9 +1607,9 @@ ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL" ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "Makefile grub/Makefile stage1/Makefile stage2/Makefile \ trap 'rm -fr `echo "Makefile grub/Makefile stage1/Makefile stage2/Makefile \
stage2_debug/Makefile e2fs_stage1_5/Makefile \ e2fs_stage1_5/Makefile fat_stage1_5/Makefile \
fat_stage1_5/Makefile ffs_stage1_5/Makefile \ ffs_stage1_5/Makefile docs/Makefile shared_src/Makefile \
docs/Makefile shared_src/Makefile debian/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 debian/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
@ -1671,7 +1660,6 @@ s%@host_cpu@%$host_cpu%g
s%@host_vendor@%$host_vendor%g s%@host_vendor@%$host_vendor%g
s%@host_os@%$host_os%g s%@host_os@%$host_os%g
s%@sbingrub@%$sbingrub%g s%@sbingrub@%$sbingrub%g
s%@stage2debug@%$stage2debug%g
s%@build@%$build%g s%@build@%$build%g
s%@build_alias@%$build_alias%g s%@build_alias@%$build_alias%g
s%@build_cpu@%$build_cpu%g s%@build_cpu@%$build_cpu%g
@ -1724,9 +1712,9 @@ EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"Makefile grub/Makefile stage1/Makefile stage2/Makefile \ CONFIG_FILES=\${CONFIG_FILES-"Makefile grub/Makefile stage1/Makefile stage2/Makefile \
stage2_debug/Makefile e2fs_stage1_5/Makefile \ e2fs_stage1_5/Makefile fat_stage1_5/Makefile \
fat_stage1_5/Makefile ffs_stage1_5/Makefile \ ffs_stage1_5/Makefile docs/Makefile shared_src/Makefile \
docs/Makefile shared_src/Makefile debian/Makefile"} debian/Makefile"}
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

12
configure.in
View file

@ -38,12 +38,6 @@ AC_ARG_ENABLE(sbin-grub,
[test "x$enableval" = xno || sbingrub=grub]) [test "x$enableval" = xno || sbingrub=grub])
AC_SUBST(sbingrub) AC_SUBST(sbingrub)
stage2debug=
AC_ARG_ENABLE(debug,
[ --enable-debug build debugging version of stage2],
[test "x$enableval" = xno || stage2debug=stage2_debug])
AC_SUBST(stage2debug)
# #
# Programs # Programs
# #
@ -110,6 +104,6 @@ EOF
done done
AC_OUTPUT([Makefile grub/Makefile stage1/Makefile stage2/Makefile \ AC_OUTPUT([Makefile grub/Makefile stage1/Makefile stage2/Makefile \
stage2_debug/Makefile e2fs_stage1_5/Makefile \ e2fs_stage1_5/Makefile fat_stage1_5/Makefile \
fat_stage1_5/Makefile ffs_stage1_5/Makefile \ ffs_stage1_5/Makefile docs/Makefile shared_src/Makefile \
docs/Makefile shared_src/Makefile debian/Makefile]) debian/Makefile])

1
debian/Makefile.in vendored
View file

@ -70,7 +70,6 @@ VERSION = @VERSION@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
sbingrub = @sbingrub@ sbingrub = @sbingrub@
stage2debug = @stage2debug@
EXTRA_DIST = README.debian changelog control copyright rules EXTRA_DIST = README.debian changelog control copyright rules

1
docs/Makefile.in
View file

@ -70,7 +70,6 @@ VERSION = @VERSION@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
sbingrub = @sbingrub@ sbingrub = @sbingrub@
stage2debug = @stage2debug@
html = boot-proposal.html errors.html faq.html grub.html install.html \ html = boot-proposal.html errors.html faq.html grub.html install.html \

1
e2fs_stage1_5/Makefile.in
View file

@ -68,7 +68,6 @@ VERSION = @VERSION@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
sbingrub = @sbingrub@ sbingrub = @sbingrub@
stage2debug = @stage2debug@
# On ext2fs, we can install into EXT2_BOOT_LOADER_INO, which gives us: # On ext2fs, we can install into EXT2_BOOT_LOADER_INO, which gives us:
# MAX-STAGE1-BLOCK-LIST * MIN-EXT2-BLOCK-SIZE = 80 * 1024 = 81920 # MAX-STAGE1-BLOCK-LIST * MIN-EXT2-BLOCK-SIZE = 80 * 1024 = 81920

1
fat_stage1_5/Makefile.in
View file

@ -68,7 +68,6 @@ VERSION = @VERSION@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
sbingrub = @sbingrub@ sbingrub = @sbingrub@
stage2debug = @stage2debug@
IMPORTANT_SIZE_LIMIT = 81920 IMPORTANT_SIZE_LIMIT = 81920

1
ffs_stage1_5/Makefile.in
View file

@ -68,7 +68,6 @@ VERSION = @VERSION@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
sbingrub = @sbingrub@ sbingrub = @sbingrub@
stage2debug = @stage2debug@
IMPORTANT_SIZE_LIMIT = 7168 IMPORTANT_SIZE_LIMIT = 7168

1
grub/Makefile.in
View file

@ -70,7 +70,6 @@ VERSION = @VERSION@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
sbingrub = @sbingrub@ sbingrub = @sbingrub@
stage2debug = @stage2debug@
EXTRA_PROGRAMS = grub EXTRA_PROGRAMS = grub

1
shared_src/Makefile.in
View file

@ -70,7 +70,6 @@ VERSION = @VERSION@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
sbingrub = @sbingrub@ sbingrub = @sbingrub@
stage2debug = @stage2debug@
noinst_HEADERS = apic.h defs.h dir.h disk_inode.h disk_inode_ffs.h \ noinst_HEADERS = apic.h defs.h dir.h disk_inode.h disk_inode_ffs.h \

4
shared_src/asm.S
View file

@ -1010,8 +1010,6 @@ gloop2ret:
ret ret
#ifdef DEBUG
ENTRY(patch_code) /* labels start with "pc_" */ ENTRY(patch_code) /* labels start with "pc_" */
.code16 .code16
@ -1030,8 +1028,6 @@ ENTRY(patch_code_end)
.code32 .code32
#endif /* DEBUG */
/* /*
* linux_boot() * linux_boot()

135
shared_src/cmdline.c
View file

@ -21,7 +21,7 @@
#include "shared.h" #include "shared.h"
#ifdef DEBUG #ifndef GRUB_UTIL
/* /*
* This is the Intel MultiProcessor Spec debugging/display code. * This is the Intel MultiProcessor Spec debugging/display code.
@ -66,7 +66,7 @@ cmos_read_byte(int loc)
#include "smp-imps.c" #include "smp-imps.c"
#endif /* DEBUG */ #endif /* ! GRUB_UTIL */
/* /*
* These are used for determining if the command-line should ask the user * These are used for determining if the command-line should ask the user
@ -75,6 +75,9 @@ cmos_read_byte(int loc)
int fallback; int fallback;
char *password; char *password;
/* True when the debug mode is turned on, and false when it is turned off. */
int debug = 0;
char * char *
skip_to(int after_equal, char *cmdline) skip_to(int after_equal, char *cmdline)
{ {
@ -99,39 +102,27 @@ init_cmdline(void)
completions of a device/filename. ESC at any time exits. ]\n"); completions of a device/filename. ESC at any time exits. ]\n");
} }
#ifdef DEBUG
char commands[] = char commands[] =
" Possible commands are: \"pause= ...\", \"uppermem= <kbytes>\", \"root= <device>\", " Possible commands are: \"pause= ...\", \"uppermem= <kbytes>\", \"root= <device>\",
\"rootnoverify= <device>\", \"chainloader= <file>\", \"kernel= <file> ...\", \"rootnoverify= <device>\", \"chainloader= <file>\", \"kernel= <file> ...\",
\"testload= <file>\", \"read= <addr>\", \"displaymem\", \"impsprobe\", \"fstest\", \"testload= <file>\", \"read= <addr>\", \"displaymem\", \"impsprobe\",
\"module= <file> ...\", \"modulenounzip= <file> ...\", \"makeactive\", \"boot\", and \"fstest\", \"debug\", \"module= <file> ...\", \"modulenounzip= <file> ...\",
\"makeactive\", \"boot\", and
\"install= <stage1_file> [d] <dest_dev> <file> <addr> [p] [<config_file>]\"\n"; \"install= <stage1_file> [d] <dest_dev> <file> <addr> [p] [<config_file>]\"\n";
#else /* DEBUG */
char commands[] =
" Possible commands are: \"pause= ...\", \"uppermem= <kbytes>\", \"root= <device>\",
\"rootnoverify= <device>\", \"chainloader= <file>\", \"kernel= <file> ...\",
\"module= <file> ...\", \"modulenounzip= <file> ...\", \"makeactive\", \"boot\", and
\"install= <stage1_file> [d] <dest_dev> <file> <addr> [p] [<config_file>]\"\n";
#endif /* DEBUG */
#ifdef DEBUG
static void static void
debug_fs_print_func(int sector) debug_fs_print_func(int sector)
{ {
printf("[%d]", sector); printf("[%d]", sector);
} }
#endif /* DEBUG */
static int installaddr, installlist, installsect; static int installaddr, installlist, installsect;
static void static void
debug_fs_blocklist_func(int sector) debug_fs_blocklist_func(int sector)
{ {
#ifdef DEBUG if (debug)
printf("[%d]", sector); printf("[%d]", sector);
#endif /* DEBUG */
if (*((unsigned long *)(installlist-4)) if (*((unsigned long *)(installlist-4))
+ *((unsigned short *)installlist) != sector + *((unsigned short *)installlist) != sector
@ -497,7 +488,6 @@ returnit:
return 1; return 1;
} }
} }
#ifdef DEBUG
else if (substring("testload", cur_heap) < 1) else if (substring("testload", cur_heap) < 1)
{ {
type = 0; type = 0;
@ -514,87 +504,94 @@ returnit:
/* read whole file first */ /* read whole file first */
printf("Whole file: "); printf("Whole file: ");
grub_read ((char *) 0x100000, -1); grub_read ((char *) RAW_ADDR (0x100000), -1);
/* now compare two sections of the file read differently */ /* now compare two sections of the file read differently */
for (i = 0; i < 0x10ac0; i++) for (i = 0; i < 0x10ac0; i++)
{ {
*((unsigned char *)(0x200000+i)) = 0; *((unsigned char *) RAW_ADDR (0x200000+i)) = 0;
*((unsigned char *)(0x300000+i)) = 1; *((unsigned char *) RAW_ADDR (0x300000+i)) = 1;
} }
/* first partial read */ /* first partial read */
printf("\nPartial read 1: "); printf("\nPartial read 1: ");
filepos = 0; filepos = 0;
grub_read ((char *) 0x200000, 0x7); grub_read ((char *) RAW_ADDR (0x200000), 0x7);
grub_read ((char *) 0x200007, 0x100); grub_read ((char *) RAW_ADDR (0x200007), 0x100);
grub_read ((char *) 0x200107, 0x10); grub_read ((char *) RAW_ADDR (0x200107), 0x10);
grub_read ((char *) 0x200117, 0x999); grub_read ((char *) RAW_ADDR (0x200117), 0x999);
grub_read ((char *) 0x200ab0, 0x10); grub_read ((char *) RAW_ADDR (0x200ab0), 0x10);
grub_read ((char *) 0x200ac0, 0x10000); grub_read ((char *) RAW_ADDR (0x200ac0), 0x10000);
/* second partial read */ /* second partial read */
printf("\nPartial read 2: "); printf("\nPartial read 2: ");
filepos = 0; filepos = 0;
grub_read ((char *) 0x300000, 0x10000); grub_read ((char *) RAW_ADDR (0x300000), 0x10000);
grub_read ((char *) 0x310000, 0x10); grub_read ((char *) RAW_ADDR (0x310000), 0x10);
grub_read ((char *) 0x310010, 0x7); grub_read ((char *) RAW_ADDR (0x310010), 0x7);
grub_read ((char *) 0x310017, 0x10); grub_read ((char *) RAW_ADDR (0x310017), 0x10);
grub_read ((char *) 0x310027, 0x999); grub_read ((char *) RAW_ADDR (0x310027), 0x999);
grub_read ((char *) 0x3109c0, 0x100); grub_read ((char *) RAW_ADDR (0x3109c0), 0x100);
printf("\nHeader1 = 0x%x, next = 0x%x, next = 0x%x, next = 0x%x\n", printf ("\nHeader1 = 0x%x, next = 0x%x, next = 0x%x, next = 0x%x\n",
*((int *)0x200000), *((int *)0x200004), *((int *)0x200008), *((int *) RAW_ADDR (0x200000)),
*((int *)0x20000c)); *((int *) RAW_ADDR (0x200004)),
*((int *) RAW_ADDR (0x200008)),
*((int *) RAW_ADDR (0x20000c)));
printf("Header2 = 0x%x, next = 0x%x, next = 0x%x, next = 0x%x\n", printf ("Header2 = 0x%x, next = 0x%x, next = 0x%x, next = 0x%x\n",
*((int *)0x300000), *((int *)0x300004), *((int *)0x300008), *((int *) RAW_ADDR (0x300000)),
*((int *)0x30000c)); *((int *) RAW_ADDR (0x300004)),
*((int *) RAW_ADDR (0x300008)),
*((int *) RAW_ADDR (0x30000c)));
for (i = 0; i < 0x10ac0 && *((unsigned char *)(0x200000+i)) for (i = 0; i < 0x10ac0 && *((unsigned char *) RAW_ADDR (0x200000+i))
== *((unsigned char *)(0x300000+i)); i++); == *((unsigned char *) RAW_ADDR (0x300000+i)); i++);
printf("Max is 0x10ac0: i=0x%x, filepos=0x%x\n", i, filepos); printf("Max is 0x10ac0: i=0x%x, filepos=0x%x\n", i, filepos);
debug_fs = NULL; debug_fs = NULL;
} }
} }
else if (substring("read", cur_heap) < 1) else if (substring ("read", cur_heap) < 1)
{ {
int myaddr; int myaddr;
if (safe_parse_maxint(&cur_cmdline, &myaddr)) if (safe_parse_maxint (&cur_cmdline, &myaddr))
printf("Address 0x%x: Value 0x%x", myaddr, *((unsigned *)myaddr)); printf ("Address 0x%x: Value 0x%x",
myaddr, *((unsigned *) RAW_ADDR (myaddr)));
} }
else if (substring("fstest", cur_heap) == 0) else if (substring ("fstest", cur_heap) == 0)
{ {
if (debug_fs) if (debug_fs)
{ {
debug_fs = NULL; debug_fs = NULL;
printf(" Filesystem tracing is now off\n"); printf (" Filesystem tracing is now off\n");
} }
else else
{ {
debug_fs = debug_fs_print_func; debug_fs = debug_fs_print_func;
printf(" Filesystem tracing is now on\n"); printf (" Filesystem tracing is now on\n");
} }
} }
else if (substring("impsprobe", cur_heap) == 0) else if (substring ("impsprobe", cur_heap) == 0)
{ {
if (!imps_probe()) #ifndef GRUB_UTIL
printf(" No MPS information found or probe failed\n"); if (!imps_probe ())
#endif
printf (" No MPS information found or probe failed\n");
} }
else if (substring("displaymem", cur_heap) == 0) else if (substring ("displaymem", cur_heap) == 0)
{ {
if (get_eisamemsize() != -1) if (get_eisamemsize () != -1)
printf(" EISA Memory BIOS Interface is present\n"); printf (" EISA Memory BIOS Interface is present\n");
if (get_mmap_entry ((void *) SCRATCHADDR, 0) != 0 || if (get_mmap_entry ((void *) SCRATCHADDR, 0) != 0 ||
*((int *) SCRATCHADDR) != 0) *((int *) SCRATCHADDR) != 0)
printf(" Address Map BIOS Interface is present\n"); printf (" Address Map BIOS Interface is present\n");
printf(" Lower memory: %uK, Upper memory (to first chipset hole): %uK\n", printf (" Lower memory: %uK, Upper memory (to first chipset hole): %uK\n",
mbi.mem_lower, mbi.mem_upper); mbi.mem_lower, mbi.mem_upper);
if (mbi.flags & MB_INFO_MEM_MAP) if (mbi.flags & MB_INFO_MEM_MAP)
@ -602,8 +599,8 @@ returnit:
struct AddrRangeDesc *map = (struct AddrRangeDesc *) mbi.mmap_addr; struct AddrRangeDesc *map = (struct AddrRangeDesc *) mbi.mmap_addr;
int end_addr = mbi.mmap_addr + mbi.mmap_length; int end_addr = mbi.mmap_addr + mbi.mmap_length;
printf(" [Address Range Descriptor entries immediately follow (values are 64-bit)]\n"); printf (" [Address Range Descriptor entries immediately follow (values are 64-bit)]\n");
while (end_addr > (int)map) while (end_addr > (int) map)
{ {
char *str; char *str;
@ -611,18 +608,30 @@ returnit:
str = "Usable RAM"; str = "Usable RAM";
else else
str = "Reserved"; str = "Reserved";
printf(" %s: Base Address: 0x%x X 4GB + 0x%x, printf (" %s: Base Address: 0x%x X 4GB + 0x%x,
Length: %u X 4GB + %u bytes\n", Length: %u X 4GB + %u bytes\n",
str, map->BaseAddrHigh, map->BaseAddrLow, str, map->BaseAddrHigh, map->BaseAddrLow,
map->LengthHigh, map->LengthLow); map->LengthHigh, map->LengthLow);
map = ((struct AddrRangeDesc *) (((int)map) + 4 + map->size)); map = ((struct AddrRangeDesc *) (((int) map) + 4 + map->size));
} }
} }
} }
#endif /* DEBUG */ else if (substring ("makeactive", cur_heap) == 0)
else if (substring("makeactive", cur_heap) == 0)
make_saved_active(); make_saved_active();
else if (substring ("debug", cur_heap) == 0)
{
if (debug)
{
debug = 0;
grub_printf (" Debug mode is turned off\n");
}
else
{
debug = 1;
grub_printf (" Debug mode is turned on\n");
}
}
else if (*cur_heap && *cur_heap != ' ') else if (*cur_heap && *cur_heap != ' ')
errnum = ERR_UNRECOGNIZED; errnum = ERR_UNRECOGNIZED;

6
shared_src/disk_io.c
View file

@ -212,10 +212,10 @@ devread (int sector, int byte_offset, int byte_len, char *buf)
sector++; sector++;
} }
#if !defined(STAGE1_5) && defined(DEBUG) #if !defined(STAGE1_5)
if (debug_fs) if (debug_fs && debug)
printf ("<%d, %d, %d>", sector, byte_offset, byte_len); printf ("<%d, %d, %d>", sector, byte_offset, byte_len);
#endif /* !STAGE1_5 && DEBUG */ #endif /* !STAGE1_5 */
/* /*
* Call RAWREAD, which is very similar, but: * Call RAWREAD, which is very similar, but:

2
shared_src/shared.h
View file

@ -310,6 +310,8 @@ extern int compressed_file;
/* instrumentation variables */ /* instrumentation variables */
extern void (*debug_fs) (int); extern void (*debug_fs) (int);
extern void (*debug_fs_func) (int); extern void (*debug_fs_func) (int);
/* The flag for debug mode. */
extern int debug;
#endif /* STAGE1_5 */ #endif /* STAGE1_5 */
extern unsigned long current_drive; extern unsigned long current_drive;

1
stage1/Makefile.in
View file

@ -68,7 +68,6 @@ VERSION = @VERSION@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
sbingrub = @sbingrub@ sbingrub = @sbingrub@
stage2debug = @stage2debug@
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)

2
stage1/stage1.S
View file

@ -419,7 +419,7 @@ lastlist:
#else #else
.long 1 /* this is the sector start parameter, in logical .long 1 /* this is the sector start parameter, in logical
sectors from the start of the disk, sector 0 */ sectors from the start of the disk, sector 0 */
.word 80 /* this is the number of sectors to read */ .word 90 /* this is the number of sectors to read */
.word 0x0800 /* this is the segment of the starting address .word 0x0800 /* this is the segment of the starting address
to load the data into */ to load the data into */
#endif #endif

1
stage2/Makefile.in
View file

@ -68,7 +68,6 @@ VERSION = @VERSION@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
sbingrub = @sbingrub@ sbingrub = @sbingrub@
stage2debug = @stage2debug@
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)

29
stage2_debug/Makefile.am
View file

@ -1,29 +0,0 @@
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
pkgdata_DATA = $(stage2debug)
EXTRA_DATA = stage2_debug
CLEANFILES = stage2_debug
MOSTLYCLEANFILES = stage2_debug.exec
# We can't use builtins or standard includes.
COMPILE = $(CC) -fno-builtin -nostdinc -DDEBUG=1 $(DEFS) $(INCLUDES) \
$(CPPFLAGS) $(CFLAGS)
INCLUDES = -I$(top_srcdir)/shared_src
# asm.o absolutely needs to come first!
stage2_debug_exec_LDADD = asm.o boot.o common.o char_io.o cmdline.o disk_io.o \
gunzip.o fsys_ffs.o fsys_ext2fs.o fsys_fat.o stage2.o bios.o
EXTRA_PROGRAMS = stage2_debug.exec
# FIXME: Automake hackery.
DEP_FILES = .deps/dummy.P $(wildcard .deps/*.P)
stage2_debug_exec_SOURCES = dummy.c # needed to drag in C Makefile variables
DISTFILES = $(DIST_COMMON)
stage2_debug.exec: $(stage2_debug_exec_LDADD)
$(LD) -N -Ttext 8000 -o stage2_debug.exec $(stage2_debug_exec_LDADD)
stage2_debug: stage2_debug.exec
$(OBJCOPY) -O binary stage2_debug.exec stage2_debug
@SHARED_SRC_RULES@

330
stage2_debug/Makefile.in
View file

@ -1,330 +0,0 @@
# Makefile.in generated automatically by automake 1.4a from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
DESTDIR =
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_FLAG =
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
AMTARFLAGS = @AMTARFLAGS@
CC = @CC@
LD = @LD@
MAKEINFO = @MAKEINFO@
OBJCOPY = @OBJCOPY@
PACKAGE = @PACKAGE@
TAR = @TAR@
VERSION = @VERSION@
host_cpu = @host_cpu@
host_vendor = @host_vendor@
sbingrub = @sbingrub@
stage2debug = @stage2debug@
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
pkgdata_DATA = $(stage2debug)
EXTRA_DATA = stage2_debug
CLEANFILES = stage2_debug
MOSTLYCLEANFILES = stage2_debug.exec
# We can't use builtins or standard includes.
COMPILE = $(CC) -fno-builtin -nostdinc -DDEBUG=1 $(DEFS) $(INCLUDES) \
$(CPPFLAGS) $(CFLAGS)
INCLUDES = -I$(top_srcdir)/shared_src
# asm.o absolutely needs to come first!
stage2_debug_exec_LDADD = asm.o boot.o common.o char_io.o cmdline.o disk_io.o \
gunzip.o fsys_ffs.o fsys_ext2fs.o fsys_fat.o stage2.o bios.o
EXTRA_PROGRAMS = stage2_debug.exec
# FIXME: Automake hackery.
DEP_FILES = .deps/dummy.P $(wildcard .deps/*.P)
stage2_debug_exec_SOURCES = dummy.c # needed to drag in C Makefile variables
DISTFILES = $(DIST_COMMON)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
DEFS = @DEFS@ -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
stage2_debug_exec_OBJECTS = dummy.o
stage2_debug_exec_DEPENDENCIES = asm.o boot.o common.o char_io.o \
cmdline.o disk_io.o gunzip.o fsys_ffs.o fsys_ext2fs.o fsys_fat.o \
stage2.o bios.o
stage2_debug_exec_LDFLAGS =
CFLAGS = @CFLAGS@
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
DATA = $(pkgdata_DATA)
DIST_COMMON = $(EXTRA_DATA) $(pkgdata_DATA) Makefile.am Makefile.in
GZIP_ENV = --best
SOURCES = $(stage2_debug_exec_SOURCES)
OBJECTS = $(stage2_debug_exec_OBJECTS)
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .o .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu stage2_debug/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
.s.o:
$(COMPILE) -c $<
.S.o:
$(COMPILE) -c $<
mostlyclean-compile:
-rm -f *.o core *.core
clean-compile:
distclean-compile:
-rm -f *.tab.c
maintainer-clean-compile:
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
@list='$(pkgdata_DATA)'; for p in $$list; do \
if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
$(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
@list='$(pkgdata_DATA)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
done
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP)
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
here=`pwd` && cd $(srcdir) \
&& mkid -f$$here/ID $$unique $(LISP)
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
mostlyclean-tags:
clean-tags:
distclean-tags:
-rm -f TAGS ID
maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = stage2_debug
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu stage2_debug/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-include $(DEP_FILES)
mostlyclean-depend:
clean-depend:
distclean-depend:
-rm -rf .deps
maintainer-clean-depend:
%.o: %.c
@echo '$(COMPILE) -c $<'; \
$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
@-cp .deps/$(*F).pp .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
>> .deps/$(*F).P; \
rm .deps/$(*F).pp
%.lo: %.c
@echo '$(LTCOMPILE) -c $<'; \
$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
< .deps/$(*F).pp > .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
>> .deps/$(*F).P; \
rm -f .deps/$(*F).pp
info-am:
info: info-am
dvi-am:
dvi: dvi-am
check-am: all-am
check: check-am
installcheck-am:
installcheck: installcheck-am
install-exec-am:
install-exec: install-exec-am
install-data-am: install-pkgdataDATA
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am: uninstall-pkgdataDATA
uninstall: uninstall-am
all-am: Makefile $(DATA)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
mostlyclean-generic:
-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
mostlyclean-am: mostlyclean-compile mostlyclean-tags mostlyclean-depend \
mostlyclean-generic
mostlyclean: mostlyclean-am
clean-am: clean-compile clean-tags clean-depend clean-generic \
mostlyclean-am
clean: clean-am
distclean-am: distclean-compile distclean-tags distclean-depend \
distclean-generic clean-am
distclean: distclean-am
maintainer-clean-am: maintainer-clean-compile maintainer-clean-tags \
maintainer-clean-depend maintainer-clean-generic \
distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
.PHONY: mostlyclean-compile distclean-compile clean-compile \
maintainer-clean-compile uninstall-pkgdataDATA install-pkgdataDATA tags \
mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
distdir mostlyclean-depend distclean-depend clean-depend \
maintainer-clean-depend info-am info dvi-am dvi check check-am \
installcheck-am installcheck install-exec-am install-exec \
install-data-am install-data install-am install uninstall-am uninstall \
all-redirect all-am all install-strip installdirs mostlyclean-generic \
distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
stage2_debug.exec: $(stage2_debug_exec_LDADD)
$(LD) -N -Ttext 8000 -o stage2_debug.exec $(stage2_debug_exec_LDADD)
stage2_debug: stage2_debug.exec
$(OBJCOPY) -O binary stage2_debug.exec stage2_debug
@SHARED_SRC_RULES@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: