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

warnings fixed

Browse Source
This commit is contained in:
Stanislav Shwartsman 2007-10-24 23:02:09 +00:00
parent f0cfc15656
commit a4e20e9d29
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/cpu/access.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: access.cc,v 1.74 2007-10-19 12:40:18 sshwarts Exp $
// $Id: access.cc,v 1.75 2007-10-24 23:01:45 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -295,7 +295,7 @@ BX_CPU_C::execute_virtual_checks(bx_segment_reg_t *seg, bx_address offset, unsig
}
}
char * BX_CPP_AttrRegparmN(1)
const char * BX_CPP_AttrRegparmN(1)
BX_CPU_C::strseg(bx_segment_reg_t *seg)
{
if (seg == &BX_CPU_THIS_PTR sregs[0]) return("ES");

4
bochs/cpu/cpu.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cpu.h,v 1.342 2007-10-23 21:51:43 sshwarts Exp $
// $Id: cpu.h,v 1.343 2007-10-24 23:02:09 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -2918,7 +2918,7 @@ public: // for now...
BX_SMF void TLB_invlpg(bx_address laddr);
BX_SMF void TLB_init(void);
BX_SMF void set_INTR(bx_bool value);
BX_SMF char *strseg(bx_segment_reg_t *seg) BX_CPP_AttrRegparmN(1);
BX_SMF const char *strseg(bx_segment_reg_t *seg) BX_CPP_AttrRegparmN(1);
BX_SMF void interrupt(Bit8u vector, bx_bool is_INT, bx_bool is_error_code,
Bit16u error_code);
BX_SMF void real_mode_int(Bit8u vector, bx_bool is_INT, bx_bool is_error_code,

6
bochs/memory/misc_mem.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: misc_mem.cc,v 1.102 2007-09-28 19:52:08 sshwarts Exp $
// $Id: misc_mem.cc,v 1.103 2007-10-24 23:00:01 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -90,7 +90,7 @@ void BX_MEM_C::init_memory(int memsize)
{
unsigned idx;
BX_DEBUG(("Init $Id: misc_mem.cc,v 1.102 2007-09-28 19:52:08 sshwarts Exp $"));
BX_DEBUG(("Init $Id: misc_mem.cc,v 1.103 2007-10-24 23:00:01 sshwarts Exp $"));
alloc_vector_aligned(memsize+ BIOSROMSZ + EXROMSIZE + 4096, BX_MEM_VECTOR_ALIGN);
BX_MEM_THIS len = memsize;
@ -551,7 +551,7 @@ bx_bool BX_MEM_C::dbg_set_mem(bx_phy_address addr, unsigned len, Bit8u *buf)
}
}
#endif // #if BX_SUPPORT_PCI
else if ((addr & 0xfffc0000) != 0x000c0000 && (addr < ~BIOS_MASK))
else if ((addr & 0xfffc0000) != 0x000c0000 && (addr < (bx_phy_address)(~BIOS_MASK)))
{
BX_MEM_THIS vector[addr] = *buf;
}