save/restore merge questions.

Hi,

I recently got back to work on the save/restore work that Bryce and I 
started sometime last spring.  As it turns out, the work is nearing 
completion, and we have reached some major milestones.  I recently did a 
cvs update with:

 cvs update -jBRANCH_SAVE_RESTORE -jHEAD

After the Bochs release, I am interested in merging with the mainline 
trunk if the changes are accepted.  For now, I am wading through my diff 
with the mainline to identify all the changes that were made, and I 
wanted to double check some changes before I proceed with testing 
save/restore some more.

After running "cvs diff -rHEAD", I get the following on apic.cc:

===================================================================
RCS file: /cvsroot/bochs/bochs/cpu/apic.cc,v
retrieving revision 1.30.4.1
diff -r1.30.4.1 apic.cc
2c2
< // $Id: apic.cc,v 1.30.4.1 2003/03/29 15:56:55 bdenney Exp $
---
> // $Id: apic.cc,v 1.30 2003/01/22 21:43:34 cbothamy Exp $
9c9
< #define LOG_THIS BX_CPU_THIS_PTR
---
> #define LOG_THIS this->
56c56
<     if (apic_index[id] != BX_CPU_THIS)
---
>     if (apic_index[id] != this)
64c64
<     apic_index[id] = BX_CPU_THIS;
---
>     apic_index[id] = this;
330c330
<   timer_handle = bx_pc_system.register_timer_ticks(BX_CPU_THIS,
---
>   timer_handle = bx_pc_system.register_timer_ticks(this,

Which version is appropriate?  I would assume the latter since that is 
from the mainline, and since those APIC functions are not part of class 
bx_cpu_c.

--Brian





-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/