mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed __386__ macro in guest2host memory accesses - should be LITTLE_ENDIAN instead

Browse Source
This commit is contained in:
Stanislav Shwartsman 2007-10-16 16:17:48 +00:00
parent f69a21ab2b
commit 6c79b067a6
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bochs/bochs.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: bochs.h,v 1.210 2007-10-12 22:11:24 sshwarts Exp $
// $Id: bochs.h,v 1.211 2007-10-16 16:17:48 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -516,14 +516,10 @@ extern bx_bool bx_gui_sighandler;
#define BX_SMP_PROCESSORS 1
#endif
void bx_init_options();
void bx_center_print (FILE *file, char *line, int maxwidth);
void bx_center_print(FILE *file, char *line, int maxwidth);
#define BX_USE_PS2_MOUSE 1
int bx_init_hardware ();
#include "instrument.h"
// These are some convenience macros which abstract out accesses between
@ -534,7 +530,7 @@ int bx_init_hardware ();
// instructions to help perform these operations more efficiently than C++.
#ifdef __i386__
#ifdef BX_LITTLE_ENDIAN
#define WriteHostWordToLittleEndian(hostPtr, nativeVar16) \
*((Bit16u*)(hostPtr)) = (nativeVar16)

15
bochs/main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.358 2007-10-11 21:28:57 sshwarts Exp $
// $Id: main.cc,v 1.359 2007-10-16 16:17:48 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -75,7 +75,10 @@ void bx_unmapped_io_write_handler(Bit32u address, Bit32u value,
unsigned io_len);
#endif
void bx_init_hardware(void);
void bx_init_options(void);
void bx_init_bx_dbg(void);
static char *divider = "========================================================================";
static logfunctions thePluginLog;
logfunctions *pluginlog = &thePluginLog;
@ -252,11 +255,11 @@ int bxmain () {
setlocale (LC_ALL, "");
#endif
bx_user_quit = 0;
bx_init_siminterface (); // create the SIM object
bx_init_siminterface(); // create the SIM object
static jmp_buf context;
if (setjmp (context) == 0) {
SIM->set_quit_context (&context);
if (bx_init_main (bx_startup_flags.argc, bx_startup_flags.argv) < 0)
if (bx_init_main(bx_startup_flags.argc, bx_startup_flags.argv) < 0)
return 0;
// read a param to decide which config interface to start.
// If one exists, start it. If not, just begin.
@ -494,7 +497,7 @@ void print_usage()
#endif
}
int bx_init_main (int argc, char *argv[])
int bx_init_main(int argc, char *argv[])
{
// To deal with initialization order problems inherent in C++, use the macros
// SAFE_GET_IOFUNC and SAFE_GET_GENLOG to retrieve "io" and "genlog" in all
@ -939,7 +942,7 @@ void bx_sr_after_restore_state(void)
DEV_after_restore_state();
}
int bx_init_hardware()
void bx_init_hardware()
{
// all configuration has been read, now initialize everything.
@ -1111,8 +1114,6 @@ int bx_init_hardware()
#endif
alarm( 1 );
#endif
return(0);
}
void bx_init_bx_dbg(void)