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

very small cleeanup

Browse Source
This commit is contained in:
Stanislav Shwartsman 2008-06-12 16:40:53 +00:00
parent 77ce9d617e
commit 607900dd4d
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/cpu/cpu.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: cpu.cc,v 1.230 2008-05-10 20:35:03 sshwarts Exp $ // $Id: cpu.cc,v 1.231 2008-06-12 16:40:52 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -171,9 +171,7 @@ no_async_event:
} }
#else #else
bxInstruction_c iStorage, *i = &iStorage; bxInstruction_c iStorage, *i = &iStorage;
unsigned remainingInPage = BX_CPU_THIS_PTR eipPageWindowSize - eipBiased; fetchInstruction(i, eipBiased);
const Bit8u *fetchPtr = BX_CPU_THIS_PTR eipFetchPtr + eipBiased;
fetchInstruction(i, fetchPtr, remainingInPage);
#endif #endif
#if BX_SUPPORT_TRACE_CACHE #if BX_SUPPORT_TRACE_CACHE

4
bochs/cpu/cpu.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: cpu.h,v 1.484 2008-06-02 20:11:03 sshwarts Exp $ // $Id: cpu.h,v 1.485 2008-06-12 16:40:52 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -2799,7 +2799,7 @@ public: // for now...
#if BX_SUPPORT_X86_64 #if BX_SUPPORT_X86_64
BX_SMF unsigned fetchDecode64(const Bit8u *fetchPtr, bxInstruction_c *i, unsigned remainingInPage) BX_CPP_AttrRegparmN(3); BX_SMF unsigned fetchDecode64(const Bit8u *fetchPtr, bxInstruction_c *i, unsigned remainingInPage) BX_CPP_AttrRegparmN(3);
#endif #endif
BX_SMF bx_bool fetchInstruction(bxInstruction_c *iStorage, const Bit8u *fetchPtr, unsigned remainingInPage); BX_SMF bx_bool fetchInstruction(bxInstruction_c *iStorage, Bit32u eipBiased);
BX_SMF void boundaryFetch(const Bit8u *fetchPtr, unsigned remainingInPage, bxInstruction_c *); BX_SMF void boundaryFetch(const Bit8u *fetchPtr, unsigned remainingInPage, bxInstruction_c *);
#if BX_SUPPORT_ICACHE #if BX_SUPPORT_ICACHE
BX_SMF void serveICacheMiss(bxICacheEntry_c *entry, Bit32u eipBiased, bx_phy_address pAddr); BX_SMF void serveICacheMiss(bxICacheEntry_c *entry, Bit32u eipBiased, bx_phy_address pAddr);

11
bochs/cpu/icache.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: icache.cc,v 1.12 2008-05-04 05:37:36 sshwarts Exp $ // $Id: icache.cc,v 1.13 2008-06-12 16:40:53 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (c) 2007 Stanislav Shwartsman // Copyright (c) 2007 Stanislav Shwartsman
@ -26,8 +26,10 @@
#include "cpu.h" #include "cpu.h"
#define LOG_THIS BX_CPU_THIS_PTR #define LOG_THIS BX_CPU_THIS_PTR
bx_bool BX_CPU_C::fetchInstruction(bxInstruction_c *iStorage, const Bit8u *fetchPtr, unsigned remainingInPage) bx_bool BX_CPU_C::fetchInstruction(bxInstruction_c *iStorage, Bit32u eipBiased)
{ {
unsigned remainingInPage = BX_CPU_THIS_PTR eipPageWindowSize - eipBiased;
const Bit8u *fetchPtr = BX_CPU_THIS_PTR eipFetchPtr + eipBiased;
unsigned ret; unsigned ret;
#if BX_SUPPORT_X86_64 #if BX_SUPPORT_X86_64
@ -163,13 +165,10 @@ bx_bool BX_CPU_C::mergeTraces(bxICacheEntry_c *entry, bxInstruction_c *i, bx_phy
void BX_CPU_C::serveICacheMiss(bxICacheEntry_c *cache_entry, Bit32u eipBiased, bx_phy_address pAddr) void BX_CPU_C::serveICacheMiss(bxICacheEntry_c *cache_entry, Bit32u eipBiased, bx_phy_address pAddr)
{ {
unsigned remainingInPage = BX_CPU_THIS_PTR eipPageWindowSize - eipBiased;
const Bit8u *fetchPtr = BX_CPU_THIS_PTR eipFetchPtr + eipBiased;
// The entry will be marked valid if fetchdecode will succeed // The entry will be marked valid if fetchdecode will succeed
cache_entry->writeStamp = ICacheWriteStampInvalid; cache_entry->writeStamp = ICacheWriteStampInvalid;
if (fetchInstruction(cache_entry->i, fetchPtr, remainingInPage)) { if (fetchInstruction(cache_entry->i, eipBiased)) {
cache_entry->pAddr = pAddr; cache_entry->pAddr = pAddr;
cache_entry->writeStamp = *(BX_CPU_THIS_PTR currPageWriteStampPtr); cache_entry->writeStamp = *(BX_CPU_THIS_PTR currPageWriteStampPtr);
} }