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

Fix compilation

Browse Source
This commit is contained in:
Stanislav Shwartsman 2006-06-21 16:30:14 +00:00
parent 3b9ef78c0a
commit c0747c8b35
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bochs/gdbstub.cc
View File

@ -351,7 +351,7 @@ static int access_linear(Bit64u laddress,
Bit8u* data) Bit8u* data)
{ {
bx_phy_address phys; bx_phy_address phys;
bx_bool valid bx_bool valid;
if (((laddress & 0xfff) + len) > 4096) if (((laddress & 0xfff) + len) > 4096)
{ {
@ -359,10 +359,8 @@ static int access_linear(Bit64u laddress,
4096 - (laddress & 0xfff), 4096 - (laddress & 0xfff),
rw, rw,
data); data);
if (!valid) if (!valid) return(0);
{
return(valid);
}
valid = access_linear(laddress, valid = access_linear(laddress,
len + (laddress & 0xfff) - 4096, len + (laddress & 0xfff) - 4096,
rw, rw,
@ -372,19 +370,15 @@ static int access_linear(Bit64u laddress,
} }
valid = BX_CPU(0)->dbg_xlate_linear2phy(laddress, (bx_phy_address*)&phys); valid = BX_CPU(0)->dbg_xlate_linear2phy(laddress, (bx_phy_address*)&phys);
if (!valid) if (!valid) return(0);
{
return(0);
}
if (rw == BX_READ) if (rw == BX_READ) {
{
valid = BX_MEM(0)->dbg_fetch_mem(phys, len, data); valid = BX_MEM(0)->dbg_fetch_mem(phys, len, data);
} }
else else {
{
valid = BX_MEM(0)->dbg_set_mem(phys, len, data); valid = BX_MEM(0)->dbg_set_mem(phys, len, data);
} }
return(valid); return(valid);
} }