[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bochs-cvs
Subject:    [Bochs-cvs] CVS: bochs gdbstub.cc,1.23,1.24
From:       Stanislav Shwartsman <sshwarts () users ! sourceforge ! net>
Date:       2006-06-21 16:30:17
Message-ID: E1Ft5ar-0002eU-6y () sc8-pr-cvs3 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/bochs/bochs
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9911

Modified Files:
	gdbstub.cc 
Log Message:
Fix compilation


Index: gdbstub.cc
===================================================================
RCS file: /cvsroot/bochs/bochs/gdbstub.cc,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- gdbstub.cc	21 Jun 2006 16:28:06 -0000	1.23
+++ gdbstub.cc	21 Jun 2006 16:30:14 -0000	1.24
@@ -351,7 +351,7 @@
                         Bit8u* data)
 {
    bx_phy_address phys;
-   bx_bool valid
+   bx_bool valid;
     
    if (((laddress & 0xfff) + len) > 4096)
    {
@@ -359,10 +359,8 @@
                              4096 - (laddress & 0xfff),
                              rw,
                              data);
-       if (!valid)
-       {
-            return(valid);
-       }
+       if (!valid) return(0);
+
        valid = access_linear(laddress,
                              len + (laddress & 0xfff) - 4096,
                              rw,
@@ -372,19 +370,15 @@
    }
    
    valid = BX_CPU(0)->dbg_xlate_linear2phy(laddress, (bx_phy_address*)&phys);
-   if (!valid)
-   {
-       return(0);
-   }
+   if (!valid) return(0);
    
-   if (rw == BX_READ)
-   {
+   if (rw == BX_READ) {
        valid = BX_MEM(0)->dbg_fetch_mem(phys, len, data);
    }
-   else
-   {
+   else {
        valid = BX_MEM(0)->dbg_set_mem(phys, len, data);
    }
+
    return(valid);
 }
 



_______________________________________________
Bochs-cvs mailing list
Bochs-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bochs-cvs
[prev in list] [next in list] [prev in thread] [next in thread]