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

Cleanup of extdb.* files. included in right places now.

Browse Source
This commit is contained in:
Peter Tattam 2002-10-01 04:13:12 +00:00
parent 3fa708ea7a
commit 94b2dd2bc8
5 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bochs/bochs.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: bochs.h,v 1.96 2002-09-22 20:56:11 cbothamy Exp $
// $Id: bochs.h,v 1.97 2002-10-01 04:13:12 ptrumpet Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -435,6 +435,10 @@ extern logfunc_t *genlog;
# include "cpu/cpu.h"
#endif
#if BX_EXTERNAL_DEBUGGER
# include "cpu/extdb.h"
#endif
#if BX_DISASM
# include "disasm/disasm.h"
#endif
@ -444,6 +448,7 @@ extern logfunc_t *genlog;
#endif
typedef struct {
Boolean floppy;
Boolean keyboard;

7
bochs/cpu/cpu.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cpu.cc,v 1.57 2002-09-29 22:38:15 kevinlawton Exp $
// $Id: cpu.cc,v 1.58 2002-10-01 04:13:12 ptrumpet Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -34,11 +34,6 @@
#define this (BX_CPU(0))
#endif
#if BX_EXTERNAL_DEBUGGER
#include "cpu/extdb.h"
#endif
#if BX_SIM_ID == 0 // only need to define once
// This array defines a look-up table for the even parity-ness

6
bochs/cpu/exception.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: exception.cc,v 1.22 2002-09-28 00:54:04 kevinlawton Exp $
// $Id: exception.cc,v 1.23 2002-10-01 04:13:12 ptrumpet Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -30,10 +30,6 @@
#include "bochs.h"
#define LOG_THIS BX_CPU_THIS_PTR
#if BX_EXTERNAL_DEBUGGER
#include "cpu/extdb.h"
#endif
/* Exception classes. These are used as indexes into the 'is_exception_OK'
* array below, and are stored in the 'exception' array also

3
bochs/cpu/extdb.cc
View File

@ -1,5 +1,4 @@
#include "bochs.h"
#include "cpu/extdb.h"
#ifdef WIN32
# include <windows.h>
#else
@ -67,6 +66,8 @@ void bx_external_debugger(BX_CPU_C *cpu)
//regs.cr5 = cpu->cr5;
//regs.cr6 = cpu->cr6;
//regs.cr7 = cpu->cr7;
regs.fsbase = cpu->sregs[BX_SEG_REG_FS].cache.u.segment.base;
regs.gsbase = cpu->sregs[BX_SEG_REG_GS].cache.u.segment.base;
regs.efer = (BX_CPU_THIS_PTR msr.sce << 0)
| (BX_CPU_THIS_PTR msr.lme << 8)
| (BX_CPU_THIS_PTR msr.lma << 10);

23
bochs/cpu/extdb.h
View File

@ -1,41 +1,20 @@
#if BX_SUPPORT_X86_64
// I have no idea why one includes, one doesn't. Fixme.
#else
#include "bochs.h"
#endif
typedef struct {
#if BX_SUPPORT_X86_64
Bit64u base;
Bit16u limit;
Bit16u fill[3];
#else
Bit32u base;
Bit16u limit;
Bit16u fill;
#endif
} descbase;
typedef struct {
#if BX_SUPPORT_X86_64
Bit64u rax,rcx,rdx,rbx,rsp,rbp,rsi,rdi,
r8,r9,r10,r11,r12,r13,r14,r15,
rip,rflags;
Bit32u es,cs,ss,ds,fs,gs,tr,ldt;
Bit64u cr0,cr1,cr2,cr3,cr4,cr5,cr6,cr7;
Bit64u fsbase,gsbase;
descbase gdt,idt;
Bit32u efer;
Bit32u debug_eip,debug_cs,debug_counter;
Bit8u debug_state;
#else
Bit32u eax,ecx,edx,ebx,esp,ebp,esi,edi,eip,eflags;
Bit32u es,cs,ss,ds,fs,gs,tr;
descbase gdt,idt;
Bit32u ldt;
Bit32u cr0,cr1,cr2,cr3;
Bit32u debug_eip,debug_cs,debug_counter;
Bit8u debug_state;
#endif
#define debug_step 0
#define debug_run 1
#define debug_count 2