1 The first two patches are needed for Bochs to properly compile and run
2 under Solaris on Sparc. If you're not compiling on Solaris, don't
3 apply them. The first should probably be handled by Autoconf; I'm not
4 sure why it isn't. The second is needed to make GCC accept X.h's
5 frequent use of "extern foo(...)", because use of an implicit int
6 return type is forbidden in C++.
8 The third patch makes the gdb stubs work on Solaris/Sparc, by doing
9 proper byteswapping. It should be harmless elsewhere.
11 The fourth patch enables the serial device under Solaris and disables
12 tty setup at the same time. Tty setup is a pain when you want to
13 connect a serial port to stdout and it doesn't work under Solaris
14 anyway. This patch is useful everywhere with `pintos', but may not be
17 To apply all the patches, cd into the Bochs directory, then type
18 patch -p1 < ~/pintos/src/misc/bochs-2.1.1.patch
19 You will have to supply the proper path to the patch, of course. You
20 can provide the --dry-run option to patch if you want to test whether
21 the patch would apply cleanly before actually patching.
23 Here's a ./configure invocation for Bochs that works optimally with
25 ./configure --with-x --with-x11 --with-term --with-nogui
26 If you want the gdb stub, add --enable-gdb-stub
27 If you want the internal debugger, add --enable-debugger
29 diff -urp orig/bochs-2.1.1/Makefile.in bochs-2.1.1/Makefile.in
30 --- orig/bochs-2.1.1/Makefile.in 2004-02-11 14:28:02.000000000 -0800
31 +++ bochs-2.1.1/Makefile.in 2004-09-13 15:05:26.281550000 -0700
32 @@ -92,7 +92,7 @@ CXX = @CXX@
33 CFLAGS = @CFLAGS@ @GUI_CFLAGS@ $(MCH_CFLAGS) $(FLA_FLAGS) @DEFINE_PLUGIN_PATH@ -DBX_SHARE_PATH='"$(sharedir)"'
34 CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@ $(MCH_CFLAGS) $(FLA_FLAGS) @DEFINE_PLUGIN_PATH@ -DBX_SHARE_PATH='"$(sharedir)"'
37 +LDFLAGS = @LDFLAGS@ -lsocket
39 # To compile with readline:
40 # linux needs just -lreadline
42 diff -urp orig/bochs-2.1.1/gui/Makefile.in bochs-2.1.1/gui/Makefile.in
43 --- orig/bochs-2.1.1/gui/Makefile.in 2003-11-28 07:07:28.000000000 -0800
44 +++ bochs-2.1.1/gui/Makefile.in 2004-09-13 15:05:09.402039000 -0700
45 @@ -44,7 +44,7 @@ SHELL = /bin/sh
49 -CXXFLAGS = $(BX_INCDIRS) @CXXFLAGS@ @GUI_CXXFLAGS@
50 +CXXFLAGS = $(BX_INCDIRS) @CXXFLAGS@ @GUI_CXXFLAGS@ -fms-extensions
56 diff -urp orig/bochs-2.1.1/gdbstub.cc bochs-2.1.1/gdbstub.cc
57 --- orig/bochs-2.1.1/gdbstub.cc 2004-02-11 14:28:41.000000000 -0800
58 +++ bochs-2.1.1/gdbstub.cc 2004-09-13 16:41:59.652988000 -0700
59 @@ -474,11 +475,13 @@ static void debug_loop(void)
68 reg = strtoul(&buffer[1], &ebuf, 16);
69 - value = ntohl(strtoul(ebuf + 1, &ebuf, 16));
70 + hex2mem(ebuf + 1, vbits, sizeof value);
71 + ReadHostDWordFromLittleEndian(vbits, value);
73 BX_INFO (("reg %d set to %x", reg, value));
75 @@ -527,35 +530,36 @@ static void debug_loop(void)
87 + WriteHostDWordToLittleEndian(registers + 0, EAX);
88 + WriteHostDWordToLittleEndian(registers + 1, ECX);
89 + WriteHostDWordToLittleEndian(registers + 2, EDX);
90 + WriteHostDWordToLittleEndian(registers + 3, EBX);
91 + WriteHostDWordToLittleEndian(registers + 4, ESP);
92 + WriteHostDWordToLittleEndian(registers + 5, EBP);
93 + WriteHostDWordToLittleEndian(registers + 6, ESI);
94 + WriteHostDWordToLittleEndian(registers + 7, EDI);
95 if (last_stop_reason == GDBSTUB_EXECUTION_BREAKPOINT)
97 - registers[8] = EIP + 1;
98 + WriteHostDWordToLittleEndian(registers + 8, EIP + 1);
102 - registers[8] = EIP;
103 + WriteHostDWordToLittleEndian(registers + 8, EIP);
105 - registers[9] = BX_CPU_THIS_PTR read_eflags();
107 - BX_CPU_THIS_PTR sregs[BX_SEG_REG_CS].selector.value;
109 - BX_CPU_THIS_PTR sregs[BX_SEG_REG_SS].selector.value;
111 - BX_CPU_THIS_PTR sregs[BX_SEG_REG_DS].selector.value;
113 - BX_CPU_THIS_PTR sregs[BX_SEG_REG_ES].selector.value;
115 - BX_CPU_THIS_PTR sregs[BX_SEG_REG_FS].selector.value;
117 - BX_CPU_THIS_PTR sregs[BX_SEG_REG_GS].selector.value;
118 + WriteHostDWordToLittleEndian(registers + 9,
119 + BX_CPU_THIS_PTR read_eflags());
120 + WriteHostDWordToLittleEndian(registers + 10,
121 + BX_CPU_THIS_PTR sregs[BX_SEG_REG_CS].selector.value);
122 + WriteHostDWordToLittleEndian(registers + 11,
123 + BX_CPU_THIS_PTR sregs[BX_SEG_REG_SS].selector.value);
124 + WriteHostDWordToLittleEndian(registers + 12,
125 + BX_CPU_THIS_PTR sregs[BX_SEG_REG_DS].selector.value);
126 + WriteHostDWordToLittleEndian(registers + 13,
127 + BX_CPU_THIS_PTR sregs[BX_SEG_REG_ES].selector.value);
128 + WriteHostDWordToLittleEndian(registers + 14,
129 + BX_CPU_THIS_PTR sregs[BX_SEG_REG_FS].selector.value);
130 + WriteHostDWordToLittleEndian(registers + 15,
131 + BX_CPU_THIS_PTR sregs[BX_SEG_REG_GS].selector.value);
132 mem2hex((char *)registers, obuf, NUMREGSBYTES);
135 --- tmp/bochs-2.1.1/iodev/serial.cc 2004-02-11 14:28:54.000001000 -0800
136 +++ bochs-2.1.1/iodev/serial.cc 2004-09-14 23:02:04.000001000 -0700
141 -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__) || defined(__GNU__) || defined(__APPLE__)
142 +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__) || defined(__GNU__) || defined(__APPLE__) || defined(__sun__)
143 #define SERIAL_ENABLE
148 BX_PANIC(("open of %s (%s) failed\n",
149 "com1", bx_options.com[0].Odev->getptr ()));
151 BX_DEBUG(("tty_id: %d",tty_id));
152 tcgetattr(tty_id, &term_orig);
153 bcopy((caddr_t) &term_orig, (caddr_t) &term_new, sizeof(struct termios));
155 term_new.c_cc[VTIME] = 0;
156 //term_new.c_iflag |= IXOFF;
157 tcsetattr(tty_id, TCSAFLUSH, &term_new);
160 #endif /* def SERIAL_ENABLE */