[aandrejevic] 59752: [SOFT386] Start implementing a new emulator library to provide 386/486 emulation support to NTVDM and perhaps other components aswell.
16 Aug
2013
16 Aug
'13
7:21 p.m.
Author: aandrejevic
Date: Fri Aug 16 19:21:02 2013
New Revision: 59752
URL: http://svn.reactos.org/svn/reactos?rev=59752&view=rev
Log:
[SOFT386]
Start implementing a new emulator library to provide 386/486 emulation support to NTVDM
and perhaps other components aswell.
Added:
branches/ntvdm/include/reactos/libs/soft386/
branches/ntvdm/include/reactos/libs/soft386/soft386.h (with props)
branches/ntvdm/lib/soft386/
branches/ntvdm/lib/soft386/CMakeLists.txt (with props)
branches/ntvdm/lib/soft386/soft386.c (with props)
Modified:
branches/ntvdm/lib/CMakeLists.txt
branches/ntvdm/subsystems/ntvdm/CMakeLists.txt
Added: branches/ntvdm/include/reactos/libs/soft386/soft386.h
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/soft…
==============================================================================
--- branches/ntvdm/include/reactos/libs/soft386/soft386.h (added)
+++ branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] Fri Aug 16 19:21:02
2013
@@ -0,0 +1,294 @@
+/*
+ * COPYRIGHT: GPL - See COPYING in the top level directory
+ * PROJECT: 386/486 CPU Emulation Library
+ * FILE: soft386.h
+ * PURPOSE: Header file for Soft386.
+ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
+ */
+
+#ifndef _SOFT386_H_
+#define _SOFT386_H_
+
+/* INCLUDES *******************************************************************/
+
+#include <windows.h>
+#include <debug.h>
+
+/* DEFINES ********************************************************************/
+
+#define SOFT386_NUM_GEN_REGS 8
+#define SOFT386_NUM_SEG_REGS 6
+#define SOFT386_NUM_CTRL_REGS 8
+#define SOFT386_NUM_DBG_REGS 8
+
+#define SOFT386_CR0_PE (1 << 0)
+#define SOFT386_CR0_MP (1 << 1)
+#define SOFT386_CR0_EM (1 << 2)
+#define SOFT386_CR0_TS (1 << 3)
+#define SOFT386_CR0_ET (1 << 4)
+#define SOFT386_CR0_NE (1 << 5)
+#define SOFT386_CR0_WP (1 << 16)
+#define SOFT386_CR0_AM (1 << 18)
+#define SOFT386_CR0_NW (1 << 29)
+#define SOFT386_CR0_CD (1 << 30)
+#define SOFT386_CR0_PG (1 << 31)
+
+struct _SOFT386_STATE;
+typedef struct _SOFT386_STATE SOFT386_STATE;
+typedef struct _SOFT386_STATE *PSOFT386_STATE;
+
+enum _SOFT386_GEN_REGS
+{
+ SOFT386_REG_EAX,
+ SOFT386_REG_ECX,
+ SOFT386_REG_EDX,
+ SOFT386_REG_EBX,
+ SOFT386_REG_ESP,
+ SOFT386_REG_EBP,
+ SOFT386_REG_ESI,
+ SOFT386_REG_EDI
+};
+
+enum _SOFT386_SEG_REGS
+{
+ SOFT386_REG_ES,
+ SOFT386_REG_CS,
+ SOFT386_REG_SS,
+ SOFT386_REG_DS,
+ SOFT386_REG_FS,
+ SOFT386_REG_GS
+};
+
+enum _SOFT386_CTRL_REGS
+{
+ SOFT386_REG_CR0,
+ SOFT386_REG_CR1,
+ SOFT386_REG_CR2,
+ SOFT386_REG_CR3,
+ SOFT386_REG_CR4,
+ SOFT386_REG_CR5,
+ SOFT386_REG_CR6,
+ SOFT386_REG_CR7
+};
+
+enum _SOFT386_DBG_REGS
+{
+ SOFT386_REG_DR0,
+ SOFT386_REG_DR1,
+ SOFT386_REG_DR2,
+ SOFT386_REG_DR3,
+ SOFT386_REG_DR4,
+ SOFT386_REG_DR5,
+ SOFT386_REG_DR6,
+ SOFT386_REG_DR7
+};
+
+typedef
+BOOLEAN
+(NTAPI *SOFT386_MEM_READ_PROC)
+(
+ PSOFT386_STATE State,
+ ULONG Address,
+ LPVOID Buffer,
+ ULONG Size
+);
+
+typedef
+BOOLEAN
+(NTAPI *SOFT386_MEM_WRITE_PROC)
+(
+ PSOFT386_STATE State,
+ ULONG Address,
+ LPVOID Buffer,
+ ULONG Size
+);
+
+typedef
+VOID
+(NTAPI *SOFT386_IO_READ_PROC)
+(
+ PSOFT386_STATE State,
+ ULONG Port,
+ LPVOID Buffer,
+ ULONG Size
+);
+
+typedef
+VOID
+(NTAPI *SOFT386_IO_WRITE_PROC)
+(
+ PSOFT386_STATE State,
+ ULONG Port,
+ LPVOID Buffer,
+ ULONG Size
+);
+
+typedef union _SOFT386_REG
+{
+ struct
+ {
+ UCHAR LowByte;
+ UCHAR HighByte;
+ };
+ USHORT LowWord;
+ ULONG Long;
+} SOFT386_REG, *PSOFT386_REG;
+
+typedef struct _SOFT386_SEG_REG
+{
+ USHORT Selector;
+
+ /* Descriptor cache */
+ ULONG Accessed : 1;
+ ULONG ReadWrite : 1;
+ ULONG DirConf : 1;
+ ULONG Executable : 1;
+ ULONG SystemType : 1;
+ ULONG Dpl : 2;
+ ULONG Present : 1;
+ ULONG Size : 1;
+ ULONG Limit;
+ ULONG Base;
+} SOFT386_SEG_REG, *PSOFT386_SEG_REG;
+
+typedef struct
+{
+ ULONG Limit : 16;
+ ULONG Base : 24;
+ ULONG Accessed : 1;
+ ULONG ReadWrite : 1;
+ ULONG DirConf : 1;
+ ULONG Executable : 1;
+ ULONG SystemType : 1;
+ ULONG Dpl : 2;
+ ULONG Present : 1;
+ ULONG LimitHigh : 4;
+ ULONG Avl : 1;
+ ULONG Reserved : 1;
+ ULONG Size : 1;
+ ULONG Granularity : 1;
+ ULONG BaseHigh : 8;
+} SOFT386_GDT_ENTRY;
+
+typedef struct
+{
+ ULONG Offset : 16;
+ ULONG Selector : 16;
+ ULONG Zero : 8;
+ ULONG Type : 4;
+ ULONG Storage : 1;
+ ULONG Dpl : 2;
+ ULONG Present : 1;
+ ULONG OffsetHigh : 16;
+} SOFT386_IDT_ENTRY;
+
+typedef struct _SOFT386_TABLE_REG
+{
+ USHORT Size;
+ ULONG Address;
+} SOFT386_TABLE_REG, *PSOFT386_TABLE_REG;
+
+typedef union _SOFT386_FLAGS_REG
+{
+ ULONG Long;
+ struct
+ {
+ ULONG Cf : 1;
+ ULONG AlwaysSet : 1;
+ ULONG Pf : 1;
+ ULONG Reserved0 : 1;
+ ULONG Af : 1;
+ ULONG Reserved1 : 1;
+ ULONG Zf : 1;
+ ULONG Sf : 1;
+ ULONG Tf : 1;
+ ULONG If : 1;
+ ULONG Df : 1;
+ ULONG Of : 1;
+ ULONG Iopl : 2;
+ ULONG Nt : 1;
+ ULONG Reserved2 : 1;
+ ULONG Rf : 1;
+ ULONG Vm : 1;
+ ULONG Ac : 1;
+ ULONG Vif : 1;
+ ULONG Vip : 1;
+ ULONG Id : 1;
+ };
+} SOFT386_FLAGS_REG, *PSOFT386_FLAGS_REG;
+
+typedef struct _SOFT386_TSS
+{
+ ULONG Link;
+ ULONG Esp0;
+ ULONG Ss0;
+ ULONG Esp1;
+ ULONG Ss1;
+ ULONG Esp2;
+ ULONG Ss2;
+ ULONG Cr3;
+ ULONG Eip;
+ ULONG Eflags;
+ ULONG Eax;
+ ULONG Ecx;
+ ULONG Edx;
+ ULONG Ebx;
+ ULONG Esp;
+ ULONG Ebp;
+ ULONG Esi;
+ ULONG Edi;
+ ULONG Es;
+ ULONG Cs;
+ ULONG Ss;
+ ULONG Ds;
+ ULONG Fs;
+ ULONG Gs;
+ ULONG Ldtr;
+ ULONG IopbOffset;
+} SOFT386_TSS, *PSOFT386_TSS;
+
+struct _SOFT386_STATE
+{
+ SOFT386_MEM_READ_PROC MemReadCallback;
+ SOFT386_MEM_WRITE_PROC MemWriteCallback;
+ SOFT386_IO_READ_PROC IoReadCallback;
+ SOFT386_IO_WRITE_PROC IoWriteCallback;
+ SOFT386_REG GeneralRegs[SOFT386_NUM_GEN_REGS];
+ SOFT386_SEG_REG SegmentRegs[SOFT386_NUM_SEG_REGS];
+ SOFT386_REG InstPtr;
+ SOFT386_FLAGS_REG Flags;
+ SOFT386_TABLE_REG Gdtr, Idtr, Ldtr, Tss;
+ ULONGLONG TimeStampCounter;
+ ULONG ControlRegisters[SOFT386_NUM_CTRL_REGS];
+ ULONG DebugRegisters[SOFT386_NUM_DBG_REGS];
+};
+
+/* FUNCTIONS ******************************************************************/
+
+VOID
+NTAPI
+Soft386Continue(PSOFT386_STATE State);
+
+VOID
+NTAPI
+Soft386StepInto(PSOFT386_STATE State);
+
+VOID
+NTAPI
+Soft386StepOver(PSOFT386_STATE State);
+
+VOID
+NTAPI
+Soft386StepOut(PSOFT386_STATE State);
+
+VOID
+NTAPI
+Soft386DumpState(PSOFT386_STATE State);
+
+VOID
+NTAPI
+Soft386Reset(PSOFT386_STATE State);
+
+#endif // _SOFT386_H_
+
+/* EOF */
Propchange: branches/ntvdm/include/reactos/libs/soft386/soft386.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: branches/ntvdm/lib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/CMakeLists.txt?rev=59…
==============================================================================
--- branches/ntvdm/lib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/ntvdm/lib/CMakeLists.txt [iso-8859-1] Fri Aug 16 19:21:02 2013
@@ -20,6 +20,7 @@
add_subdirectory(sdk)
add_subdirectory(smlib)
add_subdirectory(tdilib)
+add_subdirectory(soft386)
else()
Added: branches/ntvdm/lib/soft386/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/CMakeLists.tx…
==============================================================================
--- branches/ntvdm/lib/soft386/CMakeLists.txt (added)
+++ branches/ntvdm/lib/soft386/CMakeLists.txt [iso-8859-1] Fri Aug 16 19:21:02 2013
@@ -0,0 +1,6 @@
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/soft386)
+
+list(APPEND SOURCE
+ soft386.c)
+
+add_library(soft386 ${SOURCE})
Propchange: branches/ntvdm/lib/soft386/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/ntvdm/lib/soft386/soft386.c
URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/soft386.c?rev…
==============================================================================
--- branches/ntvdm/lib/soft386/soft386.c (added)
+++ branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] Fri Aug 16 19:21:02 2013
@@ -0,0 +1,118 @@
+/*
+ * COPYRIGHT: GPL - See COPYING in the top level directory
+ * PROJECT: 386/486 CPU Emulation Library
+ * FILE: soft386.c
+ * PURPOSE: Functions meant for use by the host.
+ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
+ */
+
+/* INCLUDES *******************************************************************/
+
+#include "soft386.h"
+
+/* DEFINES ********************************************************************/
+
+typedef enum
+{
+ SOFT386_STEP_INTO,
+ SOFT386_STEP_OVER,
+ SOFT386_STEP_OUT,
+ SOFT386_CONTINUE
+} SOFT386_EXEC_CMD;
+
+/* PRIVATE FUNCTIONS **********************************************************/
+
+static
+VOID
+NTAPI
+Soft386ExecutionControl(PSOFT386_STATE State, INT Command)
+{
+ // TODO: NOT IMPLEMENTED!!!
+ UNIMPLEMENTED;
+}
+
+/* PUBLIC FUNCTIONS ***********************************************************/
+
+VOID
+NTAPI
+Soft386Continue(PSOFT386_STATE State)
+{
+ /* Call the internal function */
+ Soft386ExecutionControl(State, SOFT386_CONTINUE);
+}
+
+VOID
+NTAPI
+Soft386StepInto(PSOFT386_STATE State)
+{
+ /* Call the internal function */
+ Soft386ExecutionControl(State, SOFT386_STEP_INTO);
+}
+
+VOID
+NTAPI
+Soft386StepOver(PSOFT386_STATE State)
+{
+ /* Call the internal function */
+ Soft386ExecutionControl(State, SOFT386_STEP_OVER);
+}
+
+VOID
+NTAPI
+Soft386StepOut(PSOFT386_STATE State)
+{
+ /* Call the internal function */
+ Soft386ExecutionControl(State, SOFT386_STEP_OUT);
+}
+
+VOID
+NTAPI
+Soft386DumpState(PSOFT386_STATE State)
+{
+ // TODO: NOT IMPLEMENTED!!!
+ UNIMPLEMENTED;
+}
+
+VOID
+NTAPI
+Soft386Reset(PSOFT386_STATE State)
+{
+ INT i;
+ SOFT386_MEM_READ_PROC MemReadCallback = State->MemReadCallback;
+ SOFT386_MEM_WRITE_PROC MemWriteCallback = State->MemWriteCallback;
+ SOFT386_IO_READ_PROC IoReadCallback = State->IoReadCallback;
+ SOFT386_IO_WRITE_PROC IoWriteCallback = State->IoWriteCallback;
+
+ /* Clear the entire structure */
+ RtlZeroMemory(State, sizeof(*State));
+
+ /* Initialize the registers */
+ State->Flags.AlwaysSet = 1;
+ State->InstPtr.LowWord = 0xFFF0;
+
+ /* Initialize segments */
+ for (i = 0; i < SOFT386_NUM_SEG_REGS; i++)
+ {
+ /* Set the selector, base and limit, other values don't apply in real mode
*/
+ State->SegmentRegs[i].Selector = 0;
+ State->SegmentRegs[i].Base = 0;
+ State->SegmentRegs[i].Limit = 0xFFFF;
+ }
+
+ /* Initialize the code segment */
+ State->SegmentRegs[SOFT386_REG_CS].Selector = 0xF000;
+ State->SegmentRegs[SOFT386_REG_CS].Base = 0xFFFF0000;
+
+ /* Initialize the IDT */
+ State->Idtr.Size = 0x3FF;
+ State->Idtr.Address = 0;
+
+ /* Initialize CR0 */
+ State->ControlRegisters[0] |= SOFT386_CR0_ET;
+
+ /* Restore the callbacks */
+ State->MemReadCallback = MemReadCallback;
+ State->MemWriteCallback = MemWriteCallback;
+ State->IoReadCallback = IoReadCallback;
+ State->IoWriteCallback = IoWriteCallback;
+}
Propchange: branches/ntvdm/lib/soft386/soft386.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis…
==============================================================================
--- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original)
+++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Fri Aug 16 19:21:02 2013
@@ -1,5 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/softx86)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/soft386)
spec2def(ntvdm.exe ntvdm.spec)
@@ -18,7 +19,7 @@
add_executable(ntvdm ${SOURCE})
set_module_type(ntvdm win32cui UNICODE)
-target_link_libraries(ntvdm softx86 softx87)
+target_link_libraries(ntvdm softx86 softx87 soft386)
add_importlibs(ntvdm msvcrt user32 gdi32 kernel32 ntdll)
add_dependencies(ntvdm softx86 softx87)
add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all)
4152
days inactive
4152
days old
0 comments
1 participants
participants (1)
-
aandrejevic＠svn.reactos.org