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

remove ome ifdefs

Browse Source
This commit is contained in:
Stanislav Shwartsman 2010-05-02 15:11:39 +00:00
parent acc82363cd
commit 0478b326c3
4 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/cpu/data_xfer16.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: data_xfer16.cc,v 1.68 2010-03-14 15:51:26 sshwarts Exp $
// $Id: data_xfer16.cc,v 1.69 2010-05-02 15:11:39 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001-2009 The Bochs Project
@ -143,7 +143,6 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::MOV_EwIwM(bxInstruction_c *i)
write_virtual_word(i->seg(), eaddr, i->Iw());
}
#if BX_CPU_LEVEL >= 3
void BX_CPP_AttrRegparmN(1) BX_CPU_C::MOVZX_GwEbM(bxInstruction_c *i)
{
bx_address eaddr = BX_CPU_CALL_METHODR(i->ResolveModrm, (i));
@ -179,7 +178,6 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::MOVSX_GwEbR(bxInstruction_c *i)
/* sign extend byte op2 into word op1 */
BX_WRITE_16BIT_REG(i->nnn(), (Bit8s) op2_8);
}
#endif
void BX_CPP_AttrRegparmN(1) BX_CPU_C::XCHG_EwGwM(bxInstruction_c *i)
{

10
bochs/cpu/descriptor.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: descriptor.h,v 1.35 2009-12-28 09:26:22 sshwarts Exp $
// $Id: descriptor.h,v 1.36 2010-05-02 15:11:39 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2007-2009 Stanislav Shwartsman
@ -40,13 +40,11 @@
typedef struct { /* bx_selector_t */
Bit16u value; /* the 16bit value of the selector */
#if BX_CPU_LEVEL >= 2
/* the following fields are extracted from the value field in protected
mode only. They're used for sake of efficiency */
/* the following fields are extracted from the value field in protected
mode only. They're used for sake of efficiency */
Bit16u index; /* 13bit index extracted from value in protected mode */
Bit8u ti; /* table indicator bit extracted from value */
Bit8u rpl; /* RPL extracted from value */
#endif
} bx_selector_t;
#define BX_SELECTOR_RPL(selector) ((selector) & 0x03)
@ -129,14 +127,12 @@ union {
* limit for byte granular, and
* (limit << 12) | 0xfff for page granular seg's
*/
#if BX_CPU_LEVEL >= 3
bx_bool g; /* granularity: 0=byte, 1=4K (page) */
bx_bool d_b; /* default size: 0=16bit, 1=32bit */
#if BX_SUPPORT_X86_64
bx_bool l; /* long mode: 0=compat, 1=64 bit */
#endif
bx_bool avl; /* available for use by system */
#endif
} segment;
struct {
Bit8u param_count; /* 5bits (0..31) #words/dword to copy from caller's

4
bochs/cpu/init.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: init.cc,v 1.242 2010-04-19 11:09:35 sshwarts Exp $
// $Id: init.cc,v 1.243 2010-05-02 15:11:39 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001-2009 The Bochs Project
@ -1198,7 +1198,7 @@ void BX_CPU_C::assert_checks(void)
if (! check_CR0(BX_CPU_THIS_PTR cr0.val32))
BX_PANIC(("assert_checks: CR0 consistency checks failed !"));
#if BX_CPU_LEVEL > 3
#if BX_CPU_LEVEL >= 4
// check CR4 consistency
if (! check_CR4(BX_CPU_THIS_PTR cr4.val32))
BX_PANIC(("assert_checks: CR4 consistency checks failed !"));

12
bochs/cpu/segment_ctrl_pro.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: segment_ctrl_pro.cc,v 1.129 2010-04-22 17:51:37 sshwarts Exp $
// $Id: segment_ctrl_pro.cc,v 1.130 2010-05-02 15:11:39 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001-2009 The Bochs Project
@ -94,11 +94,9 @@ BX_CPU_C::load_seg_reg(bx_segment_reg_t *seg, Bit16u new_value)
return;
}
else if ((seg==&BX_CPU_THIS_PTR sregs[BX_SEG_REG_DS]) ||
(seg==&BX_CPU_THIS_PTR sregs[BX_SEG_REG_ES])
#if BX_CPU_LEVEL >= 3
|| (seg==&BX_CPU_THIS_PTR sregs[BX_SEG_REG_FS]) ||
(seg==&BX_CPU_THIS_PTR sregs[BX_SEG_REG_ES]) ||
(seg==&BX_CPU_THIS_PTR sregs[BX_SEG_REG_FS]) ||
(seg==&BX_CPU_THIS_PTR sregs[BX_SEG_REG_GS])
#endif
)
{
bx_descriptor_t descriptor;
@ -188,14 +186,12 @@ BX_CPU_C::load_seg_reg(bx_segment_reg_t *seg, Bit16u new_value)
seg->cache.type = BX_DATA_READ_WRITE_ACCESSED;
seg->cache.dpl = 3; /* we are in v8086 mode */
seg->cache.u.segment.limit_scaled = 0xffff;
#if BX_CPU_LEVEL >= 3
seg->cache.u.segment.g = 0; /* byte granular */
seg->cache.u.segment.d_b = 0; /* default 16bit size */
#if BX_SUPPORT_X86_64
seg->cache.u.segment.l = 0; /* default 16bit size */
#endif
seg->cache.u.segment.avl = 0;
#endif
}
if (seg == &BX_CPU_THIS_PTR sregs[BX_SEG_REG_CS]) {
@ -369,7 +365,6 @@ BX_CPU_C::get_descriptor_h(const bx_descriptor_t *d)
}
}
#if BX_CPU_LEVEL >= 3
bx_bool BX_CPU_C::set_segment_ar_data(bx_segment_reg_t *seg, bx_bool valid,
Bit16u raw_selector, bx_address base, Bit32u limit_scaled, Bit16u ar_data)
{
@ -416,7 +411,6 @@ bx_bool BX_CPU_C::set_segment_ar_data(bx_segment_reg_t *seg, bx_bool valid,
return d->valid;
}
#endif
void parse_descriptor(Bit32u dword1, Bit32u dword2, bx_descriptor_t *temp)
{