This commit is contained in:
Stanislav Shwartsman 2009-04-05 18:22:03 +00:00
parent c9383813f0
commit 248af1b0c3

View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: segment_ctrl_pro.cc,v 1.111 2009-04-05 18:16:29 sshwarts Exp $ // $Id: segment_ctrl_pro.cc,v 1.112 2009-04-05 18:22:03 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -351,7 +351,7 @@ BX_CPU_C::get_descriptor_l(const bx_descriptor_t *d)
} }
else { else {
Bit32u limit = d->u.system.limit_scaled; Bit32u limit = d->u.system.limit_scaled;
if (d->u.segment.g) if (d->u.system.g)
limit >>= 12; limit >>= 12;
switch (d->type) { switch (d->type) {
@ -381,7 +381,7 @@ BX_CPU_C::get_descriptor_h(const bx_descriptor_t *d)
if (d->segment) { if (d->segment) {
Bit32u limit = d->u.segment.limit_scaled; Bit32u limit = d->u.segment.limit_scaled;
if (d->u.system.g) if (d->u.segment.g)
limit >>= 12; limit >>= 12;
val = (d->u.segment.base & 0xff000000) | val = (d->u.segment.base & 0xff000000) |
((d->u.segment.base >> 16) & 0x000000ff) | ((d->u.segment.base >> 16) & 0x000000ff) |