RE: cpu.cc merge question

Look for CVS commits log, it was a patch merged by Kevin, if I remember
right patch.icache-kpl.
I did a lot more changes than you see now ;)

Thanks,
Stanislav

-----Original Message-----
From: bochs-developers-admin@xxxxxxxxxxxxxxxxxxxxx
[mailto:bochs-developers-admin@xxxxxxxxxxxxxxxxxxxxx]On Behalf Of Brian
Slechta
Sent: Saturday, November 22, 2003 11:10 AM
To: bochs-developers@xxxxxxxxxxxxxxxxxxxxx
Subject: [Bochs-developers] cpu.cc merge question


Hi,

When trying to merge the BRANCH_SAVE_RESTORE branch with that in the
mainline, I have encounted a merge conflict that I am unsure how deal
with in cpu.cc.  Here is some of the code:

<<<<<<< cpu.cc
  unsigned iCacheHash;
  Bit32u pAddr, pageWriteStamp;
=======
      unsigned iCacheHash;
      Bit32u pAddr, pageWriteStamp, fetchModeMask;
 >>>>>>> 1.76.2.8

revision 1.76.2.8 is my branch, and there is an extra variable
"fetchModeMask" that is used throughout the function.  The mainline does
not have this variable...  Which version should I choose?  Is it safe to
assume it is no longer needed, or is this a needed addiction?

--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/
_______________________________________________
bochs-developers mailing list
bochs-developers@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/bochs-developers



-------------------------------------------------------
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/