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

Initialize CPU and APIC after the bx_pc_system object

Browse Source
This commit is contained in:
Stanislav Shwartsman 2006-01-05 21:39:11 +00:00
parent cab24c37b4
commit b07e698b3e
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bochs/cpu/cpu.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: cpu.cc,v 1.119 2005-12-28 19:18:50 sshwarts Exp $ // $Id: cpu.cc,v 1.120 2006-01-05 21:39:11 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -31,16 +31,6 @@
#include "iodev/iodev.h" #include "iodev/iodev.h"
#define LOG_THIS BX_CPU_THIS_PTR #define LOG_THIS BX_CPU_THIS_PTR
#if BX_SMP_PROCESSORS==1
// single processor simulation, so there's one of everything
BOCHSAPI BX_CPU_C bx_cpu;
BOCHSAPI BX_MEM_C bx_mem;
#else
// multiprocessor simulation, we need an array of cpus and memories
BOCHSAPI BX_CPU_C *bx_cpu_array[BX_SMP_PROCESSORS];
BOCHSAPI BX_MEM_C *bx_mem_array[BX_ADDRESS_SPACES];
#endif
#if BX_SUPPORT_ICACHE #if BX_SUPPORT_ICACHE
bxPageWriteStampTable pageWriteStampTable; bxPageWriteStampTable pageWriteStampTable;

14
bochs/main.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.298 2005-11-26 21:36:50 sshwarts Exp $ // $Id: main.cc,v 1.299 2006-01-05 21:39:11 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2002 MandrakeSoft S.A. // Copyright (C) 2002 MandrakeSoft S.A.
@ -75,8 +75,6 @@ void bx_unmapped_io_write_handler(Bit32u address, Bit32u value,
void bx_close_harddrive(void); void bx_close_harddrive(void);
#endif #endif
void bx_init_bx_dbg (void); void bx_init_bx_dbg (void);
static char *divider = "========================================================================"; static char *divider = "========================================================================";
static logfunctions thePluginLog; static logfunctions thePluginLog;
@ -95,6 +93,16 @@ bx_pc_system_c bx_pc_system;
bx_debug_t bx_dbg; bx_debug_t bx_dbg;
#if BX_SMP_PROCESSORS==1
// single processor simulation, so there's one of everything
BOCHSAPI BX_CPU_C bx_cpu;
BOCHSAPI BX_MEM_C bx_mem;
#else
// multiprocessor simulation, we need an array of cpus and memories
BOCHSAPI BX_CPU_C *bx_cpu_array[BX_SMP_PROCESSORS];
BOCHSAPI BX_MEM_C *bx_mem_array[BX_ADDRESS_SPACES];
#endif
char *bochsrc_filename = NULL; char *bochsrc_filename = NULL;
void bx_print_header () void bx_print_header ()