diff --git a/bochs/main.cc b/bochs/main.cc index c3618cfcc..a162b5481 100644 --- a/bochs/main.cc +++ b/bochs/main.cc @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: main.cc,v 1.304 2006-01-17 07:58:11 sshwarts Exp $ +// $Id: main.cc,v 1.305 2006-01-17 08:02:25 sshwarts Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2002 MandrakeSoft S.A. @@ -93,6 +93,9 @@ bx_pc_system_c bx_pc_system; bx_debug_t bx_dbg; +// We have to define BX_CPU_C objects AFTER bx_pc_system_c is defined +// BX_CPU_C::local_apic object defines it own timer in constructor +// and pc_system_c constructor might overwrite it ! #if BX_SMP_PROCESSORS==1 // single processor simulation, so there's one of everything BOCHSAPI BX_CPU_C bx_cpu;