Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Writing to read-only data selector now causes a fault.

Browse source
This commit is contained in:
TomW 2015-06-21 14:54:58 +01:00
commit b5a498683a
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/386_common.h
View file

@ -44,7 +44,7 @@ extern uint16_t ea_rseg;
} }
#define CHECK_WRITE(seg, low, high) \ #define CHECK_WRITE(seg, low, high) \
if ((low < (seg)->limit_low) || (high > (seg)->limit_high)) \ if ((low < (seg)->limit_low) || (high > (seg)->limit_high) || !((seg)->access & 2)) \
{ \ { \
x86gpf("Limit check", 0); \ x86gpf("Limit check", 0); \
return 1; \ return 1; \

1
src/x86_ops_mov.h
View file

@ -158,6 +158,7 @@ static int opMOV_b_imm_a16(uint32_t fetchdat)
uint8_t temp; uint8_t temp;
fetch_ea_16(fetchdat); fetch_ea_16(fetchdat);
temp = readmemb(cs,pc); pc++; if (abrt) return 1; temp = readmemb(cs,pc); pc++; if (abrt) return 1;
CHECK_WRITE(ea_seg, eaaddr, eaaddr);
seteab(temp); seteab(temp);
CLOCK_CYCLES(timing_rr); CLOCK_CYCLES(timing_rr);
return abrt; return abrt;

19
src/x86seg.c
View file

@ -59,7 +59,7 @@ uint8_t opcode2;
static void seg_reset(x86seg *s) static void seg_reset(x86seg *s)
{ {
s->access = 0 << 5; s->access = (0 << 5) | 2;
s->limit = 0xFFFF; s->limit = 0xFFFF;
s->limit_low = 0; s->limit_low = 0;
s->limit_high = 0xffff; s->limit_high = 0xffff;
@ -201,7 +201,7 @@ static void do_seg_load(x86seg *s, uint16_t *segdat)
static void do_seg_v86_init(x86seg *s) static void do_seg_v86_init(x86seg *s)
{ {
s->access = 3 << 5; s->access = (3 << 5) | 2;
s->limit = 0xffff; s->limit = 0xffff;
s->limit_low = 0; s->limit_low = 0;
s->limit_high = 0xffff; s->limit_high = 0xffff;
@ -399,6 +399,7 @@ void loadseg(uint16_t seg, x86seg *s)
} }
else else
{ {
s->access = (3 << 5) | 2;
s->base = seg << 4; s->base = seg << 4;
s->seg = seg; s->seg = seg;
if (s == &_ss) if (s == &_ss)
@ -525,8 +526,8 @@ void loadcs(uint16_t seg)
_cs.limit_low = 0; _cs.limit_low = 0;
_cs.limit_high = 0xffff; _cs.limit_high = 0xffff;
CS=seg; CS=seg;
if (eflags&VM_FLAG) _cs.access=3<<5; if (eflags&VM_FLAG) _cs.access=(3<<5) | 2;
else _cs.access=0<<5; else _cs.access=(0<<5) | 2;
if (CPL==3 && oldcpl!=3) flushmmucache_cr3(); if (CPL==3 && oldcpl!=3) flushmmucache_cr3();
} }
} }
@ -759,8 +760,8 @@ void loadcsjmp(uint16_t seg, uint32_t oxpc)
_cs.limit_low = 0; _cs.limit_low = 0;
_cs.limit_high = 0xffff; _cs.limit_high = 0xffff;
CS=seg; CS=seg;
if (eflags&VM_FLAG) _cs.access=3<<5; if (eflags&VM_FLAG) _cs.access=(3<<5) | 2;
else _cs.access=0<<5; else _cs.access=(0<<5) | 2;
if (CPL==3 && oldcpl!=3) flushmmucache_cr3(); if (CPL==3 && oldcpl!=3) flushmmucache_cr3();
} }
} }
@ -1265,8 +1266,8 @@ void loadcscall(uint16_t seg)
_cs.limit_low = 0; _cs.limit_low = 0;
_cs.limit_high = 0xffff; _cs.limit_high = 0xffff;
CS=seg; CS=seg;
if (eflags&VM_FLAG) _cs.access=3<<5; if (eflags&VM_FLAG) _cs.access=(3<<5) | 2;
else _cs.access=0<<5; else _cs.access=(0<<5) | 2;
if (CPL==3 && oldcpl!=3) flushmmucache_cr3(); if (CPL==3 && oldcpl!=3) flushmmucache_cr3();
} }
} }
@ -2063,7 +2064,7 @@ void pmodeiret(int is32)
_cs.limit_low = 0; _cs.limit_low = 0;
_cs.limit_high = 0xffff; _cs.limit_high = 0xffff;
CS=seg; CS=seg;
_cs.access=3<<5; _cs.access=(3<<5) | 2;
if (CPL==3 && oldcpl!=3) flushmmucache_cr3(); if (CPL==3 && oldcpl!=3) flushmmucache_cr3();
ESP=newsp; ESP=newsp;