Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 68601: [NTVDM]: EMS functions. - Implement function 4Dh "Get All Handles Number of Pages", 54h "Get Handle Directory / Search for Named Handle / Get Total Number of Handles" - Fix the re...
by hbelusca＠svn.reactos.org 05 Aug '15

05 Aug '15

Author: hbelusca Date: Wed Aug 5 19:06:58 2015 New Revision: 68601 URL: http://svn.reactos.org/svn/reactos?rev=68601&view=rev Log: [NTVDM]: EMS functions. - Implement function 4Dh "Get All Handles Number of Pages", 54h "Get Handle Directory / Search for Named Handle / Get Total Number of Handles" - Fix the return error of few functions. - Start handling the "system handle" (special handle 0; see the specs for more details); WIP. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Wed Aug 5 19:06:58 2015 @@ -27,6 +27,7 @@ #define EMS_DEVICE_NAME "EMMXXXX0" #define EMS_SEGMENT_SIZE ((EMS_PHYSICAL_PAGES * EMS_PAGE_SIZE) >> 4) +#define EMS_SYSTEM_HANDLE 0 /* PRIVATE VARIABLES **********************************************************/ @@ -45,9 +46,9 @@ static VOID InitHandlesTable(VOID) { - ULONG i; - - for (i = 0; i < EMS_MAX_HANDLES; i++) + USHORT i; + + for (i = 0; i < ARRAYSIZE(HandleTable); i++) { HandleTable[i].Allocated = FALSE; HandleTable[i].PageCount = 0; @@ -59,22 +60,21 @@ static PEMS_HANDLE CreateHandle(PUSHORT Handle) { PEMS_HANDLE HandleEntry; - ULONG i; - - for (i = 0; i < EMS_MAX_HANDLES; i++) + USHORT i; + + /* Handle 0 is reserved (system handle) */ + for (i = 1; i < ARRAYSIZE(HandleTable); i++) { HandleEntry = &HandleTable[i]; if (!HandleEntry->Allocated) { *Handle = i; - break; - } - } - - if (i == EMS_MAX_HANDLES) return NULL; - HandleEntry->Allocated = TRUE; - - return HandleEntry; + HandleEntry->Allocated = TRUE; + return HandleEntry; + } + } + + return NULL; } static VOID FreeHandle(PEMS_HANDLE HandleEntry) @@ -82,12 +82,12 @@ HandleEntry->Allocated = FALSE; HandleEntry->PageCount = 0; RtlZeroMemory(HandleEntry->Name, sizeof(HandleEntry->Name)); - // InitializeListHead(HandleEntry->PageList); + // InitializeListHead(&HandleEntry->PageList); } static inline PEMS_HANDLE GetHandleRecord(USHORT Handle) { - if (Handle >= EMS_MAX_HANDLES) return NULL; + if (Handle >= ARRAYSIZE(HandleTable)) return NULL; return &HandleTable[Handle]; } @@ -116,7 +116,9 @@ } InitializeListHead(&HandleEntry->PageList); - FreeHandle(HandleEntry); + + if (Handle != EMS_SYSTEM_HANDLE) + FreeHandle(HandleEntry); return EMS_STATUS_SUCCESS; } @@ -162,6 +164,57 @@ return EMS_STATUS_SUCCESS; } +static UCHAR InitSystemHandle(USHORT NumPages) +{ + // + // FIXME: This is an adapted copy of EmsAlloc!! + // + + ULONG i, CurrentIndex = 0; + PEMS_HANDLE HandleEntry = &HandleTable[EMS_SYSTEM_HANDLE]; + + /* The system handle must never have been initialized before */ + ASSERT(!HandleEntry->Allocated); + + /* Now allocate it */ + HandleEntry->Allocated = TRUE; + + while (HandleEntry->PageCount < NumPages) + { + ULONG RunStart; + ULONG RunSize = RtlFindNextForwardRunClear(&AllocBitmap, CurrentIndex, &RunStart); + + if (RunSize == 0) + { + /* Free what's been allocated already and report failure */ + EmsFree(EMS_SYSTEM_HANDLE); + // FIXME: For this function (and EmsAlloc as well), + // use instead an internal function that just uses + // PEMS_HANDLE pointers instead. It's only in the + // EMS interrupt handler that we should do the + // unfolding. + return EMS_STATUS_INSUFFICIENT_PAGES; + } + else if ((HandleEntry->PageCount + RunSize) > NumPages) + { + /* We don't need the entire run */ + RunSize = NumPages - HandleEntry->PageCount; + } + + CurrentIndex = RunStart + RunSize; + HandleEntry->PageCount += RunSize; + RtlSetBits(&AllocBitmap, RunStart, RunSize); + + for (i = 0; i < RunSize; i++) + { + PageTable[RunStart + i].Handle = EMS_SYSTEM_HANDLE; + InsertTailList(&HandleEntry->PageList, &PageTable[RunStart + i].Entry); + } + } + + return EMS_STATUS_SUCCESS; +} + static PEMS_PAGE GetLogicalPage(PEMS_HANDLE HandleEntry, USHORT LogicalPage) { PLIST_ENTRY Entry = HandleEntry->PageList.Flink; @@ -236,8 +289,10 @@ USHORT Handle; UCHAR Status = EmsAlloc(getBX(), &Handle); + if (Status == EMS_STATUS_SUCCESS) + setDX(Handle); + setAH(Status); - if (Status == EMS_STATUS_SUCCESS) setDX(Handle); break; } @@ -266,14 +321,18 @@ /* Save Page Map */ case 0x47: { + // FIXME: This depends on an EMS handle given in DX RtlCopyMemory(MappingBackup, Mapping, sizeof(Mapping)); + setAH(EMS_STATUS_SUCCESS); break; } /* Restore Page Map */ case 0x48: { + // FIXME: This depends on an EMS handle given in DX RtlCopyMemory(Mapping, MappingBackup, sizeof(Mapping)); + setAH(EMS_STATUS_SUCCESS); break; } @@ -281,9 +340,9 @@ case 0x4B: { USHORT NumOpenHandles = 0; - ULONG i; - - for (i = 0; i < EMS_MAX_HANDLES; i++) + USHORT i; + + for (i = 0; i < ARRAYSIZE(HandleTable); i++) { if (HandleTable[i].Allocated) ++NumOpenHandles; @@ -307,6 +366,29 @@ setAH(EMS_STATUS_SUCCESS); setBX(HandleEntry->PageCount); + break; + } + + /* Get All Handles Number of Pages */ + case 0x4D: + { + PEMS_HANDLE_PAGE_INFO HandlePageInfo = (PEMS_HANDLE_PAGE_INFO)SEG_OFF_TO_PTR(getES(), getDI()); + USHORT NumOpenHandles = 0; + USHORT i; + + for (i = 0; i < ARRAYSIZE(HandleTable); i++) + { + if (HandleTable[i].Allocated) + { + HandlePageInfo->Handle = i; + HandlePageInfo->PageCount = HandleTable[i].PageCount; + ++HandlePageInfo; + ++NumOpenHandles; + } + } + + setAH(EMS_STATUS_SUCCESS); + setBX(NumOpenHandles); break; } @@ -340,7 +422,99 @@ else { DPRINT1("Invalid subfunction %02X for EMS function AH = 53h\n", getAL()); - setAH(EMS_STATUS_UNKNOWN_FUNCTION); + setAH(EMS_STATUS_INVALID_SUBFUNCTION); + } + + break; + } + + /* Handle Directory functions */ + case 0x54: + { + if (getAL() == 0x00) + { + /* Get Handle Directory */ + + PEMS_HANDLE_DIR_ENTRY HandleDir = (PEMS_HANDLE_DIR_ENTRY)SEG_OFF_TO_PTR(getES(), getDI()); + USHORT NumOpenHandles = 0; + USHORT i; + + for (i = 0; i < ARRAYSIZE(HandleTable); i++) + { + if (HandleTable[i].Allocated) + { + HandleDir->Handle = i; + RtlCopyMemory(HandleDir->Name, + HandleTable[i].Name, + sizeof(HandleDir->Name)); + ++HandleDir; + ++NumOpenHandles; + } + } + + setAH(EMS_STATUS_SUCCESS); + setAL((UCHAR)NumOpenHandles); + } + else if (getAL() == 0x01) + { + /* Search for Named Handle */ + + PUCHAR HandleName = (PUCHAR)SEG_OFF_TO_PTR(getDS(), getSI()); + PEMS_HANDLE HandleFound = NULL; + USHORT i; + + for (i = 0; i < ARRAYSIZE(HandleTable); i++) + { + if (HandleTable[i].Allocated && + RtlCompareMemory(HandleName, + HandleTable[i].Name, + sizeof(HandleTable[i].Name)) != 0) + { + HandleFound = &HandleTable[i]; + break; + } + } + + /* Bail out if no handle was found */ + if (i >= ARRAYSIZE(HandleTable)) // HandleFound == NULL + { + setAH(EMS_STATUS_HANDLE_NOT_FOUND); + break; + } + + /* Return the handle number */ + setDX(i); + + /* Sanity check: Check whether the handle was unnamed */ + i = 0; + while ((i < sizeof(HandleFound->Name)) && (HandleFound->Name[i] == '\0')) + ++i; + + if (i >= sizeof(HandleFound->Name)) + { + setAH(EMS_STATUS_UNNAMED_HANDLE); + } + else + { + setAH(EMS_STATUS_SUCCESS); + } + } + else if (getAL() == 0x02) + { + /* + * Get Total Number of Handles + * + * This function retrieves the maximum number of handles + * (allocated or not) the memory manager supports, which + * a program may request. + */ + setAH(EMS_STATUS_SUCCESS); + setBX(ARRAYSIZE(HandleTable)); + } + else + { + DPRINT1("Invalid subfunction %02X for EMS function AH = 54h\n", getAL()); + setAH(EMS_STATUS_INVALID_SUBFUNCTION); } break; @@ -436,15 +610,14 @@ { if (getAL() == 0x00) { + PEMS_MAPPABLE_PHYS_PAGE PageArray = (PEMS_MAPPABLE_PHYS_PAGE)SEG_OFF_TO_PTR(getES(), getDI()); ULONG i; - WORD Offset = getDI(); for (i = 0; i < EMS_PHYSICAL_PAGES; i++) { - *(PWORD)SEG_OFF_TO_PTR(getES(), Offset++) = - EMS_SEGMENT + i * (EMS_PAGE_SIZE >> 4); - - *(PWORD)SEG_OFF_TO_PTR(getES(), Offset++) = i; + PageArray->PageSegment = EMS_SEGMENT + i * (EMS_PAGE_SIZE >> 4); + PageArray->PageNumber = i; + ++PageArray; } setAH(EMS_STATUS_SUCCESS); @@ -458,7 +631,7 @@ else { DPRINT1("Invalid subfunction %02X for EMS function AH = 58h\n", getAL()); - setAH(EMS_STATUS_UNKNOWN_FUNCTION); + setAH(EMS_STATUS_INVALID_SUBFUNCTION); } break; @@ -490,7 +663,7 @@ else { DPRINT1("Invalid subfunction %02X for EMS function AH = 59h\n", getAL()); - setAH(EMS_STATUS_UNKNOWN_FUNCTION); + setAH(EMS_STATUS_INVALID_SUBFUNCTION); } break; @@ -601,14 +774,31 @@ return FALSE; } + InitHandlesTable(); + /* + * FIXME: We should ensure that the system handle is associated + * with mapped pages from conventional memory. DosEmu seems to do + * it correctly. 384kB of memory mapped. + */ + if (InitSystemHandle(384/16) != EMS_STATUS_SUCCESS) + { + DPRINT1("Impossible to allocate pages for the system handle!\n"); + + RtlFreeHeap(RtlGetProcessHeap(), 0, EmsMemory); + EmsMemory = NULL; + RtlFreeHeap(RtlGetProcessHeap(), 0, PageTable); + PageTable = NULL; + RtlFreeHeap(RtlGetProcessHeap(), 0, BitmapBuffer); + BitmapBuffer = NULL; + + UmaDescRelease(EmsSegment); + return FALSE; + } + MemInstallFastMemoryHook((PVOID)TO_LINEAR(EmsSegment, 0), EMS_PHYSICAL_PAGES * EMS_PAGE_SIZE, EmsReadMemory, EmsWriteMemory); - - // FIXME: The EMS driver MUST automatically initialize handle 0x0000 - // (operating system handle) as per the specification says! - InitHandlesTable(); /* Create the device */ Node = DosCreateDeviceEx(DOS_DEVATTR_IOCTL | DOS_DEVATTR_CHARACTER, Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] Wed Aug 5 19:06:58 2015 @@ -23,15 +23,19 @@ /* 16 MB of EMS memory */ #define EMS_TOTAL_PAGES 1024 -#define EMS_STATUS_SUCCESS 0x00 -#define EMS_STATUS_INTERNAL_ERROR 0x80 -#define EMS_STATUS_INVALID_HANDLE 0x83 -#define EMS_STATUS_NO_MORE_HANDLES 0x85 -#define EMS_STATUS_INSUFFICIENT_PAGES 0x88 -#define EMS_STATUS_ZERO_PAGES 0x89 -#define EMS_STATUS_INV_LOGICAL_PAGE 0x8A -#define EMS_STATUS_INV_PHYSICAL_PAGE 0x8B -#define EMS_STATUS_UNKNOWN_FUNCTION 0x8F +#define EMS_STATUS_SUCCESS 0x00 +#define EMS_STATUS_INTERNAL_ERROR 0x80 +#define EMS_STATUS_INVALID_HANDLE 0x83 +#define EMS_STATUS_UNKNOWN_FUNCTION 0x84 +#define EMS_STATUS_NO_MORE_HANDLES 0x85 +#define EMS_STATUS_INSUFFICIENT_PAGES 0x88 +#define EMS_STATUS_ZERO_PAGES 0x89 +#define EMS_STATUS_INV_LOGICAL_PAGE 0x8A +#define EMS_STATUS_INV_PHYSICAL_PAGE 0x8B +#define EMS_STATUS_INVALID_SUBFUNCTION 0x8F +#define EMS_STATUS_HANDLE_NOT_FOUND 0xA0 +#define EMS_STATUS_UNNAMED_HANDLE 0xA1 +#define EMS_STATUS_HANDLE_ALREADY_EXISTS 0xA1 typedef struct _EMS_HANDLE { @@ -49,6 +53,18 @@ #pragma pack(push, 1) +typedef struct _EMS_HANDLE_PAGE_INFO +{ + USHORT Handle; + USHORT PageCount; +} EMS_HANDLE_PAGE_INFO, *PEMS_HANDLE_PAGE_INFO; + +typedef struct _EMS_HANDLE_DIR_ENTRY +{ + USHORT Handle; + UCHAR Name[8]; +} EMS_HANDLE_DIR_ENTRY, *PEMS_HANDLE_DIR_ENTRY; + typedef struct _EMS_COPY_DATA { ULONG RegionLength; @@ -61,6 +77,12 @@ USHORT DestOffset; USHORT DestSegment; } EMS_COPY_DATA, *PEMS_COPY_DATA; + +typedef struct _EMS_MAPPABLE_PHYS_PAGE +{ + USHORT PageSegment; + USHORT PageNumber; +} EMS_MAPPABLE_PHYS_PAGE, *PEMS_MAPPABLE_PHYS_PAGE; typedef struct _EMS_HARDWARE_INFO {

1 0

[hbelusca] 68600: [NTVDM] - Increase the maximum number of EMS handles to the maximum permitted by the specification (ie. 255 handles) - Zero out EMS handles names. - EMS status are always returned...
by hbelusca＠svn.reactos.org 05 Aug '15

05 Aug '15

Author: hbelusca Date: Wed Aug 5 15:12:46 2015 New Revision: 68600 URL: http://svn.reactos.org/svn/reactos?rev=68600&view=rev Log: [NTVDM] - Increase the maximum number of EMS handles to the maximum permitted by the specification (ie. 255 handles) - Zero out EMS handles names. - EMS status are always returned in the AH register! - Implement functions 4Bh "Get Number of Opened Handles" and 4Ch "Get Handle Number of Pages" - Remove an hardcoded value. - Cosmetic change: rename EMS_STATUS_OK to EMS_STATUS_SUCCESS to comply with the name convention used also in XMS, etc... Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Wed Aug 5 15:12:46 2015 @@ -4,6 +4,9 @@ * FILE: emsdrv.c * PURPOSE: DOS EMS Driver * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * + * DOCUMENTATION: Official specification: + * LIM EMS v4.0: http://www.phatcode.net/res/218/files/limems40.txt */ /* INCLUDES *******************************************************************/ @@ -48,6 +51,7 @@ { HandleTable[i].Allocated = FALSE; HandleTable[i].PageCount = 0; + RtlZeroMemory(HandleTable[i].Name, sizeof(HandleTable[i].Name)); InitializeListHead(&HandleTable[i].PageList); } } @@ -77,6 +81,8 @@ { HandleEntry->Allocated = FALSE; HandleEntry->PageCount = 0; + RtlZeroMemory(HandleEntry->Name, sizeof(HandleEntry->Name)); + // InitializeListHead(HandleEntry->PageList); } static inline PEMS_HANDLE GetHandleRecord(USHORT Handle) @@ -110,10 +116,9 @@ } InitializeListHead(&HandleEntry->PageList); - FreeHandle(HandleEntry); - return EMS_STATUS_OK; + return EMS_STATUS_SUCCESS; } static UCHAR EmsAlloc(USHORT NumPages, PUSHORT Handle) @@ -154,7 +159,7 @@ } } - return EMS_STATUS_OK; + return EMS_STATUS_SUCCESS; } static PEMS_PAGE GetLogicalPage(PEMS_HANDLE HandleEntry, USHORT LogicalPage) @@ -186,7 +191,7 @@ { /* Unmap */ Mapping[PhysicalPage] = NULL; - return EMS_STATUS_OK; + return EMS_STATUS_SUCCESS; } PageEntry = GetLogicalPage(HandleEntry, LogicalPage); @@ -194,7 +199,7 @@ Mapping[PhysicalPage] = (PVOID)((ULONG_PTR)EmsMemory + ARRAY_INDEX(PageEntry, PageTable) * EMS_PAGE_SIZE); - return EMS_STATUS_OK; + return EMS_STATUS_SUCCESS; } static VOID WINAPI EmsIntHandler(LPWORD Stack) @@ -204,22 +209,22 @@ /* Get Manager Status */ case 0x40: { - setAH(EMS_STATUS_OK); + setAH(EMS_STATUS_SUCCESS); break; } /* Get Page Frame Segment */ case 0x41: { - setAH(EMS_STATUS_OK); + setAH(EMS_STATUS_SUCCESS); setBX(EmsSegment); break; } - /* Get Number of Pages */ + /* Get Number of Unallocated Pages */ case 0x42: { - setAH(EMS_STATUS_OK); + setAH(EMS_STATUS_SUCCESS); setBX(RtlNumberOfClearBits(&AllocBitmap)); setDX(EmsTotalPages); break; @@ -232,7 +237,7 @@ UCHAR Status = EmsAlloc(getBX(), &Handle); setAH(Status); - if (Status == EMS_STATUS_OK) setDX(Handle); + if (Status == EMS_STATUS_SUCCESS) setDX(Handle); break; } @@ -253,7 +258,7 @@ /* Get EMM Version */ case 0x46: { - setAH(EMS_STATUS_OK); + setAH(EMS_STATUS_SUCCESS); setAL(EMS_VERSION_NUM); break; } @@ -272,6 +277,39 @@ break; } + /* Get Number of Opened Handles */ + case 0x4B: + { + USHORT NumOpenHandles = 0; + ULONG i; + + for (i = 0; i < EMS_MAX_HANDLES; i++) + { + if (HandleTable[i].Allocated) + ++NumOpenHandles; + } + + setAH(EMS_STATUS_SUCCESS); + setBX(NumOpenHandles); + break; + } + + /* Get Handle Number of Pages */ + case 0x4C: + { + PEMS_HANDLE HandleEntry = GetHandleRecord(getDX()); + + if (!ValidateHandle(HandleEntry)) + { + setAH(EMS_STATUS_INVALID_HANDLE); + break; + } + + setAH(EMS_STATUS_SUCCESS); + setBX(HandleEntry->PageCount); + break; + } + /* Get/Set Handle Name */ case 0x53: { @@ -279,7 +317,7 @@ if (!ValidateHandle(HandleEntry)) { - setAL(EMS_STATUS_INVALID_HANDLE); + setAH(EMS_STATUS_INVALID_HANDLE); break; } @@ -289,7 +327,7 @@ RtlCopyMemory(SEG_OFF_TO_PTR(getES(), getDI()), HandleEntry->Name, sizeof(HandleEntry->Name)); - setAH(EMS_STATUS_OK); + setAH(EMS_STATUS_SUCCESS); } else if (getAL() == 0x01) { @@ -297,7 +335,7 @@ RtlCopyMemory(HandleEntry->Name, SEG_OFF_TO_PTR(getDS(), getSI()), sizeof(HandleEntry->Name)); - setAH(EMS_STATUS_OK); + setAH(EMS_STATUS_SUCCESS); } else { @@ -321,18 +359,16 @@ { /* Expanded memory */ HandleEntry = GetHandleRecord(Data->SourceHandle); - if (!ValidateHandle(HandleEntry)) { - setAL(EMS_STATUS_INVALID_HANDLE); + setAH(EMS_STATUS_INVALID_HANDLE); break; } PageEntry = GetLogicalPage(HandleEntry, Data->SourceSegment); - if (!PageEntry) { - setAL(EMS_STATUS_INV_LOGICAL_PAGE); + setAH(EMS_STATUS_INV_LOGICAL_PAGE); break; } @@ -350,18 +386,16 @@ { /* Expanded memory */ HandleEntry = GetHandleRecord(Data->DestHandle); - if (!ValidateHandle(HandleEntry)) { - setAL(EMS_STATUS_INVALID_HANDLE); + setAH(EMS_STATUS_INVALID_HANDLE); break; } PageEntry = GetLogicalPage(HandleEntry, Data->DestSegment); - if (!PageEntry) { - setAL(EMS_STATUS_INV_LOGICAL_PAGE); + setAH(EMS_STATUS_INV_LOGICAL_PAGE); break; } @@ -393,7 +427,7 @@ RtlMoveMemory(DestPtr, SourcePtr, Data->RegionLength); } - setAL(EMS_STATUS_OK); + setAH(EMS_STATUS_SUCCESS); break; } @@ -408,17 +442,17 @@ for (i = 0; i < EMS_PHYSICAL_PAGES; i++) { *(PWORD)SEG_OFF_TO_PTR(getES(), Offset++) = - EMS_SEGMENT + i * (EMS_PAGE_SIZE >> 4); + EMS_SEGMENT + i * (EMS_PAGE_SIZE >> 4); *(PWORD)SEG_OFF_TO_PTR(getES(), Offset++) = i; } - setAH(EMS_STATUS_OK); + setAH(EMS_STATUS_SUCCESS); setCX(EMS_PHYSICAL_PAGES); } else if (getAL() == 0x01) { - setAH(EMS_STATUS_OK); + setAH(EMS_STATUS_SUCCESS); setCX(EMS_PHYSICAL_PAGES); } else @@ -444,12 +478,12 @@ HardwareInfo->DmaRegisterSets = 0; HardwareInfo->DmaChannelOperation = 0; - setAH(EMS_STATUS_OK); + setAH(EMS_STATUS_SUCCESS); } else if (getAL() == 0x01) { /* Same as function AH = 42h */ - setAH(EMS_STATUS_OK); + setAH(EMS_STATUS_SUCCESS); setBX(RtlNumberOfClearBits(&AllocBitmap)); setDX(EmsTotalPages); } @@ -517,7 +551,6 @@ { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; - return DOS_DEVSTAT_DONE; } @@ -531,8 +564,6 @@ EmsSegment = (Segment != 0 ? Segment : EMS_SEGMENT); Size = EMS_SEGMENT_SIZE; // Size in paragraphs if (!UmaDescReserve(&EmsSegment, &Size)) return FALSE; - - InitHandlesTable(); EmsTotalPages = TotalPages; BitmapBuffer = RtlAllocateHeap(RtlGetProcessHeap(), @@ -575,16 +606,18 @@ EmsReadMemory, EmsWriteMemory); + // FIXME: The EMS driver MUST automatically initialize handle 0x0000 + // (operating system handle) as per the specification says! + InitHandlesTable(); + /* Create the device */ Node = DosCreateDeviceEx(DOS_DEVATTR_IOCTL | DOS_DEVATTR_CHARACTER, EMS_DEVICE_NAME, - 32); + Int16To32StubSize); Node->IoctlReadRoutine = EmsDrvDispatchIoctlRead; - RegisterInt32(MAKELONG(sizeof(DOS_DRIVER) + DEVICE_CODE_SIZE, HIWORD(Node->Driver)), - EMS_INTERRUPT_NUM, - EmsIntHandler, - NULL); + RegisterInt32(DEVICE_PRIVATE_AREA(Node->Driver), + EMS_INTERRUPT_NUM, EmsIntHandler, NULL); return TRUE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] Wed Aug 5 15:12:46 2015 @@ -14,7 +14,8 @@ #define EMS_VERSION_NUM 0x40 #define EMS_INTERRUPT_NUM 0x67 #define EMS_SEGMENT 0xD000 // Default segment -#define EMS_MAX_HANDLES 16 +// Specification: Operating system handle 0x0000; user handles from 0x0001 to 0x00FE +#define EMS_MAX_HANDLES 255 #define EMS_PAGE_BITS 14 #define EMS_PAGE_SIZE (1 << EMS_PAGE_BITS) #define EMS_PHYSICAL_PAGES 4 @@ -22,7 +23,7 @@ /* 16 MB of EMS memory */ #define EMS_TOTAL_PAGES 1024 -#define EMS_STATUS_OK 0x00 +#define EMS_STATUS_SUCCESS 0x00 #define EMS_STATUS_INTERNAL_ERROR 0x80 #define EMS_STATUS_INVALID_HANDLE 0x83 #define EMS_STATUS_NO_MORE_HANDLES 0x85

1 0

[aandrejevic] 68599: [NTVDM] Implement EMS function AH = 58h "Get Mappable Physical Physical Address Array".
by aandrejevic＠svn.reactos.org 05 Aug '15

05 Aug '15

Author: aandrejevic Date: Wed Aug 5 03:57:28 2015 New Revision: 68599 URL: http://svn.reactos.org/svn/reactos?rev=68599&view=rev Log: [NTVDM] Implement EMS function AH = 58h "Get Mappable Physical Physical Address Array". Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Wed Aug 5 03:57:28 2015 @@ -397,6 +397,39 @@ break; } + /* Get Mappable Physical Address Array */ + case 0x58: + { + if (getAL() == 0x00) + { + ULONG i; + WORD Offset = getDI(); + + for (i = 0; i < EMS_PHYSICAL_PAGES; i++) + { + *(PWORD)SEG_OFF_TO_PTR(getES(), Offset++) = + EMS_SEGMENT + i * (EMS_PAGE_SIZE >> 4); + + *(PWORD)SEG_OFF_TO_PTR(getES(), Offset++) = i; + } + + setAH(EMS_STATUS_OK); + setCX(EMS_PHYSICAL_PAGES); + } + else if (getAL() == 0x01) + { + setAH(EMS_STATUS_OK); + setCX(EMS_PHYSICAL_PAGES); + } + else + { + DPRINT1("Invalid subfunction %02X for EMS function AH = 58h\n", getAL()); + setAH(EMS_STATUS_UNKNOWN_FUNCTION); + } + + break; + } + /* Get Expanded Memory Hardware Information */ case 0x59: {

1 0

[hbelusca] 68598: [NTVDM] - Add some level of "Advanced debugging" (see ntvdm.h) which one can adjust to enable/disable debugging features inside NTVDM (this can be useful as long as NTVDM is under...
by hbelusca＠svn.reactos.org 04 Aug '15

04 Aug '15

Author: hbelusca Date: Tue Aug 4 20:17:05 2015 New Revision: 68598 URL: http://svn.reactos.org/svn/reactos?rev=68598&view=rev Log: [NTVDM] - Add some level of "Advanced debugging" (see ntvdm.h) which one can adjust to enable/disable debugging features inside NTVDM (this can be useful as long as NTVDM is under heavy bugfixing. When it will be more perfect, this stuff will be removed). - Add the possibility to load option ROMs at a given segment. Currently their list should be specified from inside ntvdm.c (in the BiosInitialize call), but I plan to make it available from a registry option (or via command-line for NTVDM-standalone mode). - Start to separate the initialization of "static" BIOS data (stuff that lives in ROM space) and initialization of "dynamic" BIOS data (eg. initializing the interrupt vector table, the BIOS data area at segment 40h, ...) so that we may be able to reuse part of our code to be able to more-or-less run external (16-bit) BIOSes, or the Windows NTVDM BIOS that uses BOPs to run some of its stuff in ntvdm in 32-bit (as we do for our 32-bit BIOS, except that *all* of our bios is 32-bit, not just some parts). Also, some file reorganization will be in order there soon... - Add video BIOS version information in memory so that tools such as Microsoft Diagnostics can correctly recognize our video BIOS (btw, we try to emulate the functionality of Cirrus' CL-GD5434). - Correctly put video BIOS ROM header (+ checksum) in memory so that it is recognized as such by diagnostics tools. - During BIOS POST, scan for ROMs starting segment 0xC000 (where video ROMs reside). - Store statically the BIOS configuration table. - Fix INT 16h, AH=12h "Get extended shift states" so that it correctly returns the state of right Ctrl and Alt keys. - Fix bit-setting state; report that our keyboard is 101/102 enhanced keyboard. - Correctly set the error return values (AH=86h and CF set) when a function of INT 15h is unsupported. - Implement INT 15h, AH=C9h "Get CPU Type and Mask Revision"; INT 1Ah, AH=02h "Get Real-Time Clock Time" and Ah=04h "Get Real-Time Clock Date" by reading the CMOS. - Implement CMOS century register support. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.h trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -23,12 +23,13 @@ #include "io.h" #include "hardware/cmos.h" +#include <stdlib.h> + /* DEFINES ********************************************************************/ /* BOP Identifiers */ #define BOP_RESET 0x00 // Windows NTVDM (SoftPC) BIOS calls BOP 0x00 - // to let the virtual machine initialize itself - // the IVT and its hardware. + // to let the virtual machine perform the POST. #define BOP_EQUIPLIST 0x11 #define BOP_GETMEMSIZE 0x12 @@ -43,94 +44,95 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -VOID WINAPI BiosEquipmentService(LPWORD Stack) +VOID WINAPI +WinNtVdmBiosReset(LPWORD Stack) { - /* Return the equipment list */ - setAX(Bda->EquipmentList); -} + DisplayMessage(L"You are loading Windows NTVDM BIOS!\n"); + // Bios32Post(Stack); -VOID WINAPI BiosGetMemorySize(LPWORD Stack) -{ - /* Return the conventional memory size in kB, typically 640 kB */ - setAX(Bda->MemorySize); + DisplayMessage(L"ReactOS NTVDM doesn't support Windows NTVDM BIOS at the moment. The VDM will shut down."); + EmulatorTerminate(); } BOOLEAN -BiosInitialize(IN LPCSTR BiosFileName) +BiosInitialize(IN LPCSTR BiosFileName, + IN LPCSTR RomFiles OPTIONAL) { BOOLEAN Success = FALSE; + BOOLEAN Success2 = FALSE; + LPCSTR RomFile; + LPSTR ptr; + ULONG RomAddress; + CHAR RomFileName[MAX_PATH + 10 + 1]; /* Disable interrupts */ setIF(0); /* Initialize the BDA and the BCT pointers */ - Bda = (PBIOS_DATA_AREA)SEG_OFF_TO_PTR(BDA_SEGMENT, 0x0000); + Bda = (PBIOS_DATA_AREA)SEG_OFF_TO_PTR(BDA_SEGMENT , 0x0000); // The BCT is found at F000:E6F5 for 100% compatible BIOSes. Bct = (PBIOS_CONFIG_TABLE)SEG_OFF_TO_PTR(BIOS_SEGMENT, 0xE6F5); - /**** HACK! HACK! for Windows NTVDM BIOS ****/ - // WinNtVdmBiosSupportInitialize(); + /* Register the BIOS support BOPs */ + RegisterBop(BOP_RESET, WinNtVdmBiosReset); // Needed for Windows NTVDM (SoftPC) BIOS. + RegisterBop(BOP_EQUIPLIST , BiosEquipmentService); // Needed by Windows NTVDM (SoftPC) BIOS + RegisterBop(BOP_GETMEMSIZE, BiosGetMemorySize); // and also NTDOS!! - // /* Register the BIOS support BOPs */ - // RegisterBop(BOP_EQUIPLIST , BiosEquipmentService); - // RegisterBop(BOP_GETMEMSIZE, BiosGetMemorySize); - - if (BiosFileName && BiosFileName[0] != '\0') + if (BiosFileName == NULL) + { + Success = Bios32Loaded = Bios32Initialize(); + } + else if (BiosFileName[0] != '\0') { PVOID BiosLocation = NULL; - DWORD BiosSize = 0; - Success = LoadBios(BiosFileName, &BiosLocation, &BiosSize); - DPRINT1("BIOS loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); - - if (!Success) return FALSE; - - DisplayMessage(L"First bytes at 0x%p: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n" - L"3 last bytes at 0x%p: 0x%02x 0x%02x 0x%02x", - BiosLocation, - *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 0), - *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 1), - *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 2), - *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 3), - *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 4), - *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 5), - *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 6), - *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 7), - *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 8), - *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 9), - - (PVOID)((ULONG_PTR)BiosLocation + BiosSize - 2), - *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + BiosSize - 2), - *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + BiosSize - 1), - *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + BiosSize - 0)); - - DisplayMessage(L"POST at 0x%p: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x", - TO_LINEAR(getCS(), getIP()), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(getCS(), getIP()) + 0), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(getCS(), getIP()) + 1), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(getCS(), getIP()) + 2), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(getCS(), getIP()) + 3), - *(PCHAR)((ULONG_PTR)SEG_OFF_TO_PTR(getCS(), getIP()) + 4)); - - /* Boot it up */ - - /* - * The CPU is already in reset-mode so that - * CS:IP points to F000:FFF0 as required. - */ - DisplayMessage(L"CS=0x%p ; IP=0x%p", getCS(), getIP()); - // setCS(0xF000); - // setIP(0xFFF0); - + Success = LoadBios(BiosFileName, &BiosLocation, NULL); + DPRINT1("BIOS file '%s' loading %s at address 0x%08x; GetLastError() = %u\n", + BiosFileName, Success ? "succeeded" : "failed", BiosLocation, GetLastError()); + } + else // if (BiosFileName[0] == '\0') + { + /* Do nothing */ Success = TRUE; } - else + + /* Bail out now if we failed to load any BIOS file */ + if (!Success) return FALSE; + + /* Load optional ROMs */ + if (RomFiles) { - WriteProtectRom((PVOID)ROM_AREA_START, - ROM_AREA_END - ROM_AREA_START + 1); + RomFile = RomFiles; + while (*RomFile) + { + strncpy(RomFileName, RomFile, ARRAYSIZE(RomFileName)); + RomFileName[ARRAYSIZE(RomFileName)-1] = '\0'; - Success = Bios32Loaded = Bios32Initialize(); + ptr = strchr(RomFileName, '|'); // Since '|' is forbidden as a valid file name, we use it as a separator for the ROM address. + if (!ptr) goto Skip; + *ptr++ = '\0'; + + RomAddress = strtoul(ptr, NULL, 0); // ROM segment + RomAddress <<= 4; // Convert to real address + if (RomAddress == 0) goto Skip; + + Success2 = LoadRom(RomFileName, (PVOID)RomAddress, NULL); + DPRINT1("ROM file '%s' loading %s at address 0x%08x; GetLastError() = %u\n", + RomFileName, Success2 ? "succeeded" : "failed", RomAddress, GetLastError()); + +Skip: + RomFile += strlen(RomFile) + 1; + } } + + /* + * Boot it up. + * The CPU is already in reset-mode so that + * CS:IP points to F000:FFF0 as required. + */ + // DisplayMessage(L"CS:IP=%04X:%04X", getCS(), getIP()); + // setCS(0xF000); + // setIP(0xFFF0); // /* Enable interrupts */ // setIF(1); Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -18,8 +18,7 @@ /* BOP Identifiers */ #define BOP_RESET 0x00 // Windows NTVDM (SoftPC) BIOS calls BOP 0x00 - // to let the virtual machine initialize itself - // the IVT and its hardware. + // to let the virtual machine perform the POST. #define BOP_EQUIPLIST 0x11 #define BOP_GETMEMSIZE 0x12 @@ -29,10 +28,6 @@ #define BDA_SEGMENT 0x40 #define BIOS_SEGMENT 0xF000 -// HACK: Disable FPU for now because it is not fully ready yet for being used -// by all applications (e.g. QBasic runtime would use the native FPU if the bit -// is set, but then subsequently fails, unless the FPU bit is unset in that case -// QBasic uses its emulated FPU). #define BIOS_EQUIPMENT_LIST 0x2E // Bit1: FPU, Bit 2: Mouse #pragma pack(push, 1) @@ -104,7 +99,8 @@ BYTE Reserved5[2]; // 0x90 BYTE Reserved6[2]; // 0x92 BYTE Reserved7[2]; // 0x94 - WORD KeybdStatusFlags; // 0x96 + BYTE KeybdStatusFlags; // 0x96 + BYTE KeybdLedFlags; // 0x97 DWORD Reserved9; // 0x98 DWORD Reserved10; // 0x9c DWORD Reserved11[2]; // 0xa0 @@ -165,7 +161,8 @@ VOID WINAPI BiosGetMemorySize(LPWORD Stack); BOOLEAN -BiosInitialize(IN LPCSTR BiosFileName); +BiosInitialize(IN LPCSTR BiosFileName, + IN LPCSTR RomFiles OPTIONAL); VOID BiosCleanup(VOID); Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -10,8 +10,9 @@ #define NDEBUG -/* For BIOS Version number */ +/* BIOS Version number and Copyright */ #include <reactos/buildno.h> +#include <reactos/version.h> #include "ntvdm.h" #include "emulator.h" @@ -106,19 +107,39 @@ #define BIOS_REVISION 0x00 // FIXME: Find a nice PS/2 486 + 487 BIOS combination! +static const BIOS_CONFIG_TABLE BiosConfigTable = +{ + sizeof(BIOS_CONFIG_TABLE), // Length + + BIOS_MODEL, // BIOS Model + BIOS_SUBMODEL, // BIOS Sub-Model + BIOS_REVISION, // BIOS Revision + + // Feature bytes + { + 0x78, // At the moment we don't have any Extended BIOS Area; see http://www.ctyme.com/intr/rb-1594.htm#Table510 + 0x00, // We don't support anything from here; see http://www.ctyme.com/intr/rb-1594.htm#Table511 + 0x10, // Bit 4: POST supports ROM-to-RAM enable/disable + 0x00, + 0x00 + } +}; + + /* * WARNING! For compatibility purposes the string "IBM" should be at F000:E00E . - * Some programs alternatively look at "COPR. IBM" that is at F000:E008 . + * Some programs otherwise look for "COPR. IBM" at F000:E008 . */ -static const CHAR BiosCopyright[] = "0000000 NTVDM IBM Compatible 486 32-bit BIOS Copyright (C) ReactOS Team 1996-2014"; -static const CHAR BiosVersion[] = "ReactOS NTVDM 32-bit BIOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")"; +static const CHAR BiosCopyright[] = "0000000 NTVDM IBM COMPATIBLE 486 BIOS COPYRIGHT (C) ReactOS Team 1996-"COPYRIGHT_YEAR; +static const CHAR BiosVersion[] = "ReactOS NTVDM 32-bit BIOS Version "KERNEL_VERSION_STR"\0" + "BIOS32 Version "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")"; static const CHAR BiosDate[] = "06/17/13"; C_ASSERT(sizeof(BiosCopyright)-1 <= 0x5B); // Ensures that we won't overflow on the POST Code starting at F000:E05B C_ASSERT(sizeof(BiosDate)-1 == 0x08); /* 16-bit bootstrap code at F000:FFF0 */ -static BYTE Bootstrap[] = +static const BYTE Bootstrap[] = { 0xEA, // jmp far ptr 0x5B, 0xE0, 0x00, 0xF0, // F000:E05B @@ -128,7 +149,7 @@ * POST code at F000:E05B. All the POST is done in 32 bit * and only at the end it calls the bootstrap interrupt. */ -static BYTE PostCode[] = +static const BYTE PostCode[] = { LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_RESET, // Call BIOS POST 0xCD, BIOS_BOOTSTRAP_LOADER, // INT 0x19 @@ -143,6 +164,18 @@ /* Get the exception number and call the emulator API */ BYTE ExceptionNumber = LOBYTE(Stack[STACK_INT_NUM]); EmulatorException(ExceptionNumber, Stack); +} + +VOID WINAPI BiosEquipmentService(LPWORD Stack) +{ + /* Return the equipment list */ + setAX(Bda->EquipmentList); +} + +VOID WINAPI BiosGetMemorySize(LPWORD Stack) +{ + /* Return the conventional memory size in kB, typically 640 kB */ + setAX(Bda->MemorySize); } static VOID WINAPI BiosMiscService(LPWORD Stack) @@ -162,7 +195,7 @@ break; } - /* Wait On External Event */ + /* Wait on External Event */ case 0x41: { BYTE Value; @@ -242,7 +275,6 @@ /* Repeat the BOP if we shouldn't return */ setCF(!Return); - break; } @@ -272,7 +304,6 @@ /* Clear CF */ Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; - break; } @@ -325,7 +356,6 @@ /* Clear CF */ Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; - break; } @@ -335,7 +365,7 @@ DPRINT1("BIOS INT 15h, AH=89h \"Switch to Protected Mode\" is UNIMPLEMENTED"); Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; - break; + goto Default; } /* Get Configuration */ @@ -349,28 +379,44 @@ /* Call successful; clear CF */ setAH(0x00); Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; - break; } /* Return Extended-Bios Data-Area Segment Address (PS) */ case 0xC1: { - // Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; - // setES(???); - + /* We do not support EBDA yet */ UNIMPLEMENTED; - - /* We do not support EBDA yet */ Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; - - break; + goto Default; } /* Pointing Device BIOS Interface (PS) */ case 0xC2: { BiosMousePs2Interface(Stack); + UNIMPLEMENTED; // Remove it when BiosMousePs2Interface is implemented! + goto Default; + } + + /* Get CPU Type and Mask Revision */ + case 0xC9: + { + /* + * We can see this function as a CPUID replacement. + * See Ralf Brown: http://www.ctyme.com/intr/rb-1613.htm + * for more information. + */ + + /* + * Fast486 is a 486DX with FPU included, + * but old enough to not support CPUID. + */ + setCX(0x0400); + + /* Call successful; clear CF */ + setAH(0x00); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; break; } @@ -437,10 +483,19 @@ break; } - default: + default: Default: { DPRINT1("BIOS Function INT 15h, AH = 0x%02X NOT IMPLEMENTED\n", getAH()); + + /* + * The original signification of the error code 0x86 is that + * no PC Cassette is present. The CF is also set in this case. + * To keep backward compatibility, newer BIOSes use this value + * to indicate an unimplemented call in INT 15h. + */ + setAH(0x86); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; } } } @@ -490,6 +545,7 @@ { switch (getAH()) { + /* Get System Time */ case 0x00: { /* Set AL to 1 if midnight had passed, 0 otherwise */ @@ -505,6 +561,7 @@ break; } + /* Set System Time */ case 0x01: { /* Set the tick count to CX:DX */ @@ -515,6 +572,62 @@ break; } + + /* Get Real-Time Clock Time */ + case 0x02: + { + UCHAR StatusB; + + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_HOURS); + setCH(IOReadB(CMOS_DATA_PORT)); + + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_MINUTES); + setCL(IOReadB(CMOS_DATA_PORT)); + + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_SECONDS); + setDH(IOReadB(CMOS_DATA_PORT)); + + /* Daylight Savings Time */ + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_STATUS_B); + StatusB = IOReadB(CMOS_DATA_PORT); + setDL(StatusB & 0x01); + + /* Clear CF */ + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + break; + } + + // /* Set Real-Time Clock Time */ + // case 0x03: + // { + // break; + // } + + /* Get Real-Time Clock Date */ + case 0x04: + { + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_CENTURY); + setCH(IOReadB(CMOS_DATA_PORT)); + + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_YEAR); + setCL(IOReadB(CMOS_DATA_PORT)); + + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_MONTH); + setDH(IOReadB(CMOS_DATA_PORT)); + + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_DAY); + setDL(IOReadB(CMOS_DATA_PORT)); + + /* Clear CF */ + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + break; + } + + // /* Set Real-Time Clock Date */ + // case 0x05: + // { + // break; + // } default: { @@ -675,7 +788,7 @@ /* Zero out all of the IVT (0x00 -- 0xFF) */ RtlZeroMemory(BaseAddress, 0x0100 * sizeof(ULONG)); -#ifdef ADVANCED_DEBUGGING +#if defined(ADVANCED_DEBUGGING) && (ADVANCED_DEBUGGING_LEVEL >= 3) // Initialize all the interrupt vectors to the default one. for (i = 0x00; i <= 0xFF; i++) RegisterBiosInt32(i, NULL); @@ -756,35 +869,20 @@ Bda->MemorySize = MAKEWORD(Low, High); } -static VOID InitializeBiosInfo(VOID) -{ - RtlZeroMemory(Bct, sizeof(*Bct)); - - Bct->Length = sizeof(*Bct); - Bct->Model = BIOS_MODEL; - Bct->SubModel = BIOS_SUBMODEL; - Bct->Revision = BIOS_REVISION; - Bct->Feature[0] = 0x70; // At the moment we don't support "wait for external event (INT 15/AH=41h)", we also don't have any "extended BIOS area allocated (usually at top of RAM)"; see http://www.ctyme.com/intr/rb-1594.htm#Table510 - Bct->Feature[1] = 0x00; // We don't support anything from here; see http://www.ctyme.com/intr/rb-1594.htm#Table511 - Bct->Feature[2] = 0x00; - Bct->Feature[3] = 0x00; - Bct->Feature[4] = 0x00; -} - - /* * The BIOS POST (Power On-Self Test) */ -static VOID +/*static*/ VOID WINAPI Bios32Post(LPWORD Stack) { static BOOLEAN FirstBoot = TRUE; -#if 0 - BOOLEAN Success; -#endif BYTE ShutdownStatus; + + /* + * Initialize BIOS/Keyboard/Video RAM dynamic data + */ DPRINT("Bios32Post\n"); @@ -879,7 +977,6 @@ * - if the word is 0000h, perform a cold reboot (aka. Reset). Everything gets initialized. * - if the word is 1234h, perform a warm reboot (aka. Ctrl-Alt-Del). Some stuff is skipped. */ - switch (Bda->SoftReset) { case 0x0000: @@ -906,17 +1003,22 @@ FirstBoot = FALSE; - /* Initialize the BDA and the BIOS ROM Information */ + /* Initialize the BDA */ InitializeBiosData(); - InitializeBiosInfo(); /* Initialize the User Data Area at 0050:XXXX */ RtlZeroMemory(SEG_OFF_TO_PTR(0x50, 0x0000), sizeof(USER_DATA_AREA)); + + + + //////// NOTE: This is more or less bios-specific //////// /* * Initialize IVT and hardware */ + // WriteUnProtectRom(...); + /* Register the BIOS 32-bit Interrupts */ InitializeBiosInt32(); @@ -924,30 +1026,15 @@ BiosHwSetup(); /* Initialize the Keyboard, Video and Mouse BIOS */ - if (!KbdBios32Initialize() || !VidBios32Initialize() || !MouseBios32Initialize()) - { - /* Stop the VDM */ - EmulatorTerminate(); - return; - } - -#if 0 - /* Initialize the Keyboard and Video BIOS */ - if (!KbdBiosInitialize() || !VidBiosInitialize()) - { - /* Stop the VDM */ - EmulatorTerminate(); - return; - } -#endif - - ///////////// MUST BE DONE AFTER IVT INITIALIZATION !! ///////////////////// - -#if 0 - /* Load some ROMs */ - Success = LoadRom("boot.bin", (PVOID)0xE0000, NULL); - DPRINT1("Test ROM loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); -#endif + KbdBios32Post(); + VidBiosPost(); + MouseBios32Post(); + + // WriteProtectRom(...); + + //////// End of more or less bios-specific section /////// + + SearchAndInitRoms(&BiosContext); @@ -968,29 +1055,42 @@ BOOLEAN Bios32Initialize(VOID) { /* - * Initialize BIOS32 static data + * Initialize BIOS/Keyboard/Video ROM static data */ + /* System BIOS Copyright */ + RtlCopyMemory(SEG_OFF_TO_PTR(BIOS_SEGMENT, 0xE000), BiosCopyright, sizeof(BiosCopyright)-1); + + /* System BIOS Version */ + RtlCopyMemory(SEG_OFF_TO_PTR(BIOS_SEGMENT, 0xE070), BiosVersion, sizeof(BiosVersion)-1); + + /* System BIOS Date */ + RtlCopyMemory(SEG_OFF_TO_PTR(BIOS_SEGMENT, 0xFFF5), BiosDate, sizeof(BiosDate)-1); + /* Bootstrap code */ - RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE05B), PostCode , sizeof(PostCode )); - RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xFFF0), Bootstrap, sizeof(Bootstrap)); - - /* System BIOS Copyright */ - RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE000), BiosCopyright, sizeof(BiosCopyright)-1); - - /* System BIOS Version */ - RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE080), BiosVersion, sizeof(BiosVersion)-1); - // FIXME: or E061, or E100 ?? - - /* System BIOS Date */ - RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xFFF5), BiosDate, sizeof(BiosDate)-1); + RtlCopyMemory(SEG_OFF_TO_PTR(BIOS_SEGMENT, 0xE05B), PostCode , sizeof(PostCode )); + RtlCopyMemory(SEG_OFF_TO_PTR(BIOS_SEGMENT, 0xFFF0), Bootstrap, sizeof(Bootstrap)); + + /* BIOS ROM Information */ + RtlCopyMemory(SEG_OFF_TO_PTR(BIOS_SEGMENT, 0xE6F5), &BiosConfigTable, sizeof(BiosConfigTable)); /* System BIOS Model (same as Bct->Model) */ - *(PBYTE)(SEG_OFF_TO_PTR(0xF000, 0xFFFE)) = BIOS_MODEL; + *(PBYTE)(SEG_OFF_TO_PTR(BIOS_SEGMENT, 0xFFFE)) = BIOS_MODEL; + + /* Initialize the Keyboard and Video BIOS */ + if (!KbdBiosInitialize() || !VidBiosInitialize() || !MouseBiosInitialize()) + { + /* Stop the VDM */ + EmulatorTerminate(); + return FALSE; + } /* Redefine our POST function */ RegisterBop(BOP_RESET, Bios32Post); + WriteProtectRom((PVOID)TO_LINEAR(BIOS_SEGMENT, 0x0000), + ROM_AREA_END - TO_LINEAR(BIOS_SEGMENT, 0x0000) + 1); + /* We are done */ return TRUE; } @@ -999,7 +1099,7 @@ { MouseBios32Cleanup(); VidBios32Cleanup(); - KbdBios32Cleanup(); + KbdBiosCleanup(); } /* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -80,7 +80,8 @@ return TRUE; } -static VOID WINAPI BiosKeyboardService(LPWORD Stack) +/* static */ +VOID WINAPI BiosKeyboardService(LPWORD Stack) { switch (getAH()) { @@ -168,11 +169,16 @@ case 0x12: { /* - * Be careful! The returned word is similar to Bda->KeybdShiftFlags + * Be careful! The returned word is similar to 'Bda->KeybdShiftFlags' * but the high byte is organized differently: - * the bytes 2 and 3 of the high byte are not the same... + * the bits 2 and 3 of the high byte are not the same: + * instead they correspond to the right CTRL and ALT keys as specified + * in bits 2 and 3 of LOBYTE(Bda->KeybdStatusFlags). */ - WORD KeybdShiftFlags = (Bda->KeybdShiftFlags & 0xF3FF); + // Bda->KeybdShiftFlags & 0xF3FF; + WORD KeybdShiftFlags = MAKEWORD(LOBYTE(Bda->KeybdShiftFlags), + (HIBYTE(Bda->KeybdShiftFlags ) & 0xF3) | + (LOBYTE(Bda->KeybdStatusFlags) & 0x0C)); /* Return the extended keyboard shift status word */ setAX(KeybdShiftFlags); @@ -188,7 +194,8 @@ } // Keyboard IRQ 1 -static VOID WINAPI BiosKeyboardIrq(LPWORD Stack) +/* static */ +VOID WINAPI BiosKeyboardIrq(LPWORD Stack) { static BOOLEAN Extended = FALSE; BOOLEAN SkipScanCode; @@ -222,8 +229,13 @@ if (ScanCode == 0xE0) { Extended = TRUE; + Bda->KeybdStatusFlags |= 0x02; goto Quit; } + + // FIXME: For diagnostic purposes. We should decide what to do then!! + if (ScanCode == 0xE1) + DPRINT1("BiosKeyboardIrq, ScanCode == 0xE1\n"); /* Check whether CF is clear. If so, skip the scan code. */ if (SkipScanCode) goto Quit; @@ -249,10 +261,12 @@ break; } - case VK_CONTROL: case VK_SHIFT: case VK_LSHIFT: case VK_RSHIFT: + case VK_CONTROL: + case VK_RCONTROL: + case VK_LCONTROL: case VK_MENU: case VK_LMENU: case VK_RMENU: @@ -288,19 +302,27 @@ /* Clear the keyboard flags */ Bda->KeybdShiftFlags = 0; + // Release right CTRL and ALT keys + Bda->KeybdStatusFlags &= ~(BDA_KBDFLAG_RCTRL | BDA_KBDFLAG_RALT); /* Set the appropriate flags based on the state */ - if (BiosKeyboardMap[VK_SHIFT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_LSHIFT; + // SHIFT if (BiosKeyboardMap[VK_RSHIFT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_RSHIFT; if (BiosKeyboardMap[VK_LSHIFT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_LSHIFT; + if (BiosKeyboardMap[VK_SHIFT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_LSHIFT; + // CTRL + if (BiosKeyboardMap[VK_RCONTROL] & (1 << 7)) Bda->KeybdStatusFlags |= BDA_KBDFLAG_RCTRL; + if (BiosKeyboardMap[VK_LCONTROL] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_LCTRL; if (BiosKeyboardMap[VK_CONTROL] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_CTRL; + // ALT + if (BiosKeyboardMap[VK_RMENU] & (1 << 7)) Bda->KeybdStatusFlags |= BDA_KBDFLAG_RALT; + if (BiosKeyboardMap[VK_LMENU] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_LALT; if (BiosKeyboardMap[VK_MENU] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_ALT; + // Others if (BiosKeyboardMap[VK_SCROLL] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_SCROLL_ON; if (BiosKeyboardMap[VK_NUMLOCK] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_NUMLOCK_ON; if (BiosKeyboardMap[VK_CAPITAL] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_CAPSLOCK_ON; if (BiosKeyboardMap[VK_INSERT] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_INSERT_ON; - if (BiosKeyboardMap[VK_RMENU] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_RALT; - if (BiosKeyboardMap[VK_LMENU] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_LALT; if (BiosKeyboardMap[VK_SNAPSHOT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_SYSRQ; if (BiosKeyboardMap[VK_PAUSE] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_PAUSE; if (BiosKeyboardMap[VK_SCROLL] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_SCROLL; @@ -310,6 +332,8 @@ /* Clear the extended key flag */ Extended = FALSE; + Bda->KeybdStatusFlags &= ~0x02; // Remove the 0xE0 code flag + // Bda->KeybdStatusFlags &= ~0x01; // Remove the 0xE1 code flag DPRINT("BiosKeyboardIrq - Character = 0x%X, ScanCode = 0x%X, KeybdShiftFlags = 0x%X\n", Character, ScanCode, Bda->KeybdShiftFlags); @@ -320,11 +344,8 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -BOOLEAN KbdBios32Initialize(VOID) -{ - /* Initialize the common Keyboard BIOS Support Library */ - if (!KbdBiosInitialize()) return FALSE; - +VOID KbdBios32Post(VOID) +{ /* Initialize the BDA */ Bda->KeybdBufferStart = FIELD_OFFSET(BIOS_DATA_AREA, KeybdBuffer); Bda->KeybdBufferEnd = Bda->KeybdBufferStart + BIOS_KBD_BUFFER_SIZE * sizeof(WORD); @@ -333,6 +354,10 @@ // FIXME: Fill the keyboard buffer with invalid values for diagnostic purposes... RtlFillMemory(((LPVOID)((ULONG_PTR)Bda + Bda->KeybdBufferStart)), BIOS_KBD_BUFFER_SIZE * sizeof(WORD), 'A'); + + Bda->KeybdShiftFlags = 0; + Bda->KeybdStatusFlags = (1 << 4); // 101/102 enhanced keyboard installed + Bda->KeybdLedFlags = 0; /* * Register the BIOS 32-bit Interrupts: @@ -341,14 +366,6 @@ */ RegisterBiosInt32(BIOS_KBD_INTERRUPT, BiosKeyboardService); EnableHwIRQ(1, BiosKeyboardIrq); - - return TRUE; -} - -VOID KbdBios32Cleanup(VOID) -{ - /* Cleanup the common Keyboard BIOS Support Library */ - KbdBiosCleanup(); } /* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -18,12 +18,14 @@ #define BDA_KBDFLAG_RSHIFT (1 << 0) #define BDA_KBDFLAG_LSHIFT (1 << 1) #define BDA_KBDFLAG_CTRL (1 << 2) +#define BDA_KBDFLAG_RCTRL (1 << 2) // Used for KeybdStatusFlags #define BDA_KBDFLAG_ALT (1 << 3) +#define BDA_KBDFLAG_RALT (1 << 3) // Used for KeybdStatusFlags #define BDA_KBDFLAG_SCROLL_ON (1 << 4) #define BDA_KBDFLAG_NUMLOCK_ON (1 << 5) #define BDA_KBDFLAG_CAPSLOCK_ON (1 << 6) #define BDA_KBDFLAG_INSERT_ON (1 << 7) -#define BDA_KBDFLAG_RALT (1 << 8) +#define BDA_KBDFLAG_LCTRL (1 << 8) #define BDA_KBDFLAG_LALT (1 << 9) #define BDA_KBDFLAG_SYSRQ (1 << 10) #define BDA_KBDFLAG_PAUSE (1 << 11) @@ -34,8 +36,7 @@ /* FUNCTIONS ******************************************************************/ -BOOLEAN KbdBios32Initialize(VOID); -VOID KbdBios32Cleanup(VOID); +VOID KbdBios32Post(VOID); #endif /* _KBDBIOS32_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -105,7 +105,7 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -BOOLEAN MouseBios32Initialize(VOID) +VOID MouseBios32Post(VOID) { BYTE ControllerConfig; @@ -127,7 +127,10 @@ /* Set up the HW vector interrupts */ EnableHwIRQ(12, BiosMouseIrq); +} +BOOLEAN MouseBiosInitialize(VOID) +{ return TRUE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -15,7 +15,8 @@ VOID BiosMousePs2Interface(LPWORD Stack); -BOOLEAN MouseBios32Initialize(VOID); +VOID MouseBios32Post(VOID); +BOOLEAN MouseBiosInitialize(VOID); VOID MouseBios32Cleanup(VOID); #endif /* _MOUBIOS32_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -13,33 +13,59 @@ #define NDEBUG #include "ntvdm.h" +#include "emulator.h" +#include "cpu/bop.h" #include "int32.h" #include "vidbios32.h" #include <bios/vidbios.h> #include "bios32p.h" +/* DEFINES ********************************************************************/ + +/* BOP Identifiers */ +#define BOP_VIDEO_INT 0x10 + /* PUBLIC FUNCTIONS ***********************************************************/ + +extern VOID WINAPI VidBiosVideoService(LPWORD Stack); +static VOID WINAPI VidBiosINT(LPWORD Stack) +{ + /* + * Set up a false stack to hardwire the BOP function (that can directly + * manipulate CPU registers) to the 32-bit interrupt function (which uses + * the stack to be able to modify the original CS:IP and FLAGS). + * + * See int32.h stack codes. + */ + WORD EmuStack[4]; + DWORD Flags = getEFLAGS(); + + DPRINT1("Calling BOP VidBiosINT\n"); + + EmuStack[STACK_FLAGS] = LOWORD(Flags); + EmuStack[STACK_CS] = getCS(); + EmuStack[STACK_IP] = getIP(); + EmuStack[STACK_INT_NUM] = BOP_VIDEO_INT; + + VidBiosVideoService(EmuStack); + + setIP(EmuStack[STACK_IP]); + setCS(EmuStack[STACK_CS]); + setEFLAGS(MAKELONG(EmuStack[STACK_FLAGS], HIWORD(Flags))); +} BOOLEAN VidBios32Initialize(VOID) { - /* Initialize the common Video BIOS Support Library */ - if (!VidBiosInitialize()) return FALSE; - - /* Register the BIOS 32-bit Interrupts */ - RegisterBiosInt32(BIOS_VIDEO_INTERRUPT, VidBiosVideoService); - - /* Vectors that should be implemented */ - RegisterBiosInt32(0x42, NULL); // Relocated Default INT 10h Video Services - RegisterBiosInt32(0x6D, NULL); // Video BIOS Entry Point - + /* Register the BIOS support BOPs */ + RegisterBop(BOP_VIDEO_INT, VidBiosINT); return TRUE; } VOID VidBios32Cleanup(VOID) { - /* Cleanup the common Video BIOS Support Library */ - VidBiosCleanup(); + /* Unregister the BIOS support BOPs */ + RegisterBop(BOP_VIDEO_INT, NULL); } /* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -13,6 +13,7 @@ #include "ntvdm.h" #include "emulator.h" #include "cpu/bop.h" +#include "int32.h" #include "bios.h" // #include "kbdbios.h" @@ -25,27 +26,73 @@ /* PUBLIC FUNCTIONS ***********************************************************/ +extern VOID WINAPI BiosKeyboardIrq(LPWORD Stack); static VOID WINAPI KbdBiosIRQ(LPWORD Stack) { - DPRINT1("KbdBiosIRQ is UNIMPLEMENTED\n"); + /* + * Set up a false stack to hardwire the BOP function (that can directly + * manipulate CPU registers) to the 32-bit interrupt function (which uses + * the stack to be able to modify the original CS:IP and FLAGS). + * + * See int32.h stack codes. + */ + WORD EmuStack[4]; + DWORD Flags = getEFLAGS(); + + DPRINT1("Calling BOP KbdBiosIRQ\n"); + + EmuStack[STACK_FLAGS] = LOWORD(Flags); + EmuStack[STACK_CS] = getCS(); + EmuStack[STACK_IP] = getIP(); + EmuStack[STACK_INT_NUM] = BOP_KBD_IRQ; + + BiosKeyboardIrq(EmuStack); + + setIP(EmuStack[STACK_IP]); + setCS(EmuStack[STACK_CS]); + setEFLAGS(MAKELONG(EmuStack[STACK_FLAGS], HIWORD(Flags))); } +extern VOID WINAPI BiosKeyboardService(LPWORD Stack); static VOID WINAPI KbdBiosINT(LPWORD Stack) { - DPRINT1("KbdBiosINT is UNIMPLEMENTED\n"); + /* + * Set up a false stack to hardwire the BOP function (that can directly + * manipulate CPU registers) to the 32-bit interrupt function (which uses + * the stack to be able to modify the original CS:IP and FLAGS). + * + * See int32.h stack codes. + */ + WORD EmuStack[4]; + DWORD Flags = getEFLAGS(); + + DPRINT1("Calling BOP KbdBiosINT\n"); + + EmuStack[STACK_FLAGS] = LOWORD(Flags); + EmuStack[STACK_CS] = getCS(); + EmuStack[STACK_IP] = getIP(); + EmuStack[STACK_INT_NUM] = BOP_KBD_IRQ; + + BiosKeyboardService(EmuStack); + + setIP(EmuStack[STACK_IP]); + setCS(EmuStack[STACK_CS]); + setEFLAGS(MAKELONG(EmuStack[STACK_FLAGS], HIWORD(Flags))); } BOOLEAN KbdBiosInitialize(VOID) { /* Register the BIOS support BOPs */ - RegisterBop(BOP_KBD_IRQ, KbdBiosIRQ); - RegisterBop(BOP_KBD_INT, KbdBiosINT); - + RegisterBop(BOP_KBD_IRQ, KbdBiosIRQ); // BiosKeyboardIrq in kbdbios32.c + RegisterBop(BOP_KBD_INT, KbdBiosINT); // BiosKeyboardService in kbdbios32.c return TRUE; } VOID KbdBiosCleanup(VOID) { + /* Unregister the BIOS support BOPs */ + RegisterBop(BOP_KBD_IRQ, NULL); + RegisterBop(BOP_KBD_INT, NULL); } /* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -81,22 +81,6 @@ BytesRead); } -static UCHAR -ComputeChecksum(IN ULONG RomLocation, - IN ULONG RomSize) -{ - ULONG RomLastAddress = RomLocation + RomSize; - UCHAR Sum = 0x00; // Using a UCHAR guarantees that we wrap at 0xFF i.e. we do a sum modulo 0x100. - - while (RomLocation < RomLastAddress) - { - Sum += *(PUCHAR)REAL_TO_PHYS(RomLocation); - ++RomLocation; - } - - return Sum; -} - static VOID InitRomRange(IN PCALLBACK16 Context, IN ULONG Start, @@ -115,16 +99,16 @@ /* Check the control sum of the ROM */ /* - * If this is an adapter ROM (Start: C8000, End: E0000), its - * reported size is stored in byte 2 of the ROM. + * If this is an adapter ROM (Start: C8000, End: E0000), + * its reported size is stored in byte 2 of the ROM. * * If this is an expansion ROM (Start: E0000, End: F0000), * its real length is 64kB. */ - RomSize = *(PUCHAR)REAL_TO_PHYS(Address + 2) * 512; + RomSize = *(PUCHAR)REAL_TO_PHYS(Address + 2) * 512; // Size in blocks of 512 bytes if (Address >= 0xE0000) RomSize = 0x10000; - Checksum = ComputeChecksum(Address, RomSize); + Checksum = CalcRomChecksum(Address, RomSize); if (Checksum == 0x00) { EntryPoint = Address + 3; @@ -157,6 +141,29 @@ } BOOLEAN +WriteUnProtectRom(IN PVOID RomLocation, + IN ULONG RomSize) +{ + return MemRemoveFastMemoryHook(RomLocation, RomSize); +} + +UCHAR +CalcRomChecksum(IN ULONG RomLocation, + IN ULONG RomSize) +{ + ULONG RomLastAddress = RomLocation + RomSize; + UCHAR Sum = 0x00; // Using a UCHAR guarantees that we wrap at 0xFF i.e. we do a sum modulo 0x100. + + while (RomLocation < RomLastAddress) + { + Sum += *(PUCHAR)REAL_TO_PHYS(RomLocation); + ++RomLocation; + } + + return Sum; +} + +BOOLEAN LoadBios(IN PCSTR BiosFileName, OUT PVOID* BiosLocation OPTIONAL, OUT PULONG BiosSize OPTIONAL) @@ -242,6 +249,9 @@ VOID SearchAndInitRoms(IN PCALLBACK16 Context) { + /* Video ROMs -- Start: C0000, End: C8000, 2kB blocks */ + InitRomRange(Context, 0xC0000, 0xC8000, 0x0800); + /* Adapters ROMs -- Start: C8000, End: E0000, 2kB blocks */ InitRomRange(Context, 0xC8000, 0xE0000, 0x0800); Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.h [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -23,6 +23,14 @@ IN ULONG RomSize); BOOLEAN +WriteUnProtectRom(IN PVOID RomLocation, + IN ULONG RomSize); + +UCHAR +CalcRomChecksum(IN ULONG RomLocation, + IN ULONG RomSize); + +BOOLEAN LoadBios(IN PCSTR BiosFileName, OUT PVOID* BiosLocation OPTIONAL, OUT PULONG BiosSize OPTIONAL); Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -11,6 +11,10 @@ #define NDEBUG +/* BIOS Version number and Copyright */ +#include <reactos/buildno.h> +#include <reactos/version.h> + #include "ntvdm.h" #include "emulator.h" #include "cpu/cpu.h" @@ -18,16 +22,14 @@ #include "memory.h" #include "bios.h" +#include "bios32/bios32p.h" +#include "rom.h" #include "bios32/vbe.h" // #include "vidbios.h" +#include "bios32/vidbios32.h" #include "io.h" #include "hardware/video/svga.h" - -/* DEFINES ********************************************************************/ - -/* BOP Identifiers */ -#define BOP_VIDEO_INT 0x10 /* MACROS *********************************************************************/ @@ -40,6 +42,19 @@ #define VGA_CRTC_DATA Bda->CrtBasePort + 1 // VGA_CRTC_DATA_MONO or VGA_CRTC_DATA_COLOR /* PRIVATE VARIABLES **********************************************************/ + +/* + * WARNING! For compatibility purposes the string "IBM" should be at C000:001E. + */ +static const CHAR BiosInfo[] = + "00000000000 Emulation of IBM VGA Compatible ROM\0" + "CL-GD5434 VGA BIOS Version 1.41 \r\n" + "Copyright (C) ReactOS Team 1996-"COPYRIGHT_YEAR"\r\n" + "The original CL-GD5434 card was created by Cirrus Logic, Inc.\r\n\0" + "BIOS Date: 06/17/13\0"; + +C_ASSERT(sizeof(BiosInfo)-1 <= 0xFF-0x05); // Ensures that we won't overflow on the Video Code + /* * VGA Register Configurations for BIOS Video Modes. @@ -3862,8 +3877,12 @@ Attached = FALSE; } -BOOLEAN VidBiosInitialize(VOID) -{ +VOID VidBiosPost(VOID) +{ + /* + * Initialize VGA BIOS32 RAM dynamic data + */ + /* Some vectors are in fact addresses to tables */ ((PULONG)BaseAddress)[0x1D] = (ULONG)NULL; // Video Parameter Tables // Far pointer to the 8x8 graphics font for the 8x8 characters 80h-FFh @@ -3875,6 +3894,56 @@ /* Relocated services by the BIOS (when needed) */ ((PULONG)BaseAddress)[0x42] = (ULONG)NULL; // Relocated Default INT 10h Video Services ((PULONG)BaseAddress)[0x6D] = (ULONG)NULL; // Video BIOS Entry Point + + // + // FIXME: At the moment we always set a VGA mode. In the future, + // we should set this mode **only** when: + // - an app starts to use directly the video memory + // (that should be done in emulator.c) + // - or starts to use non-stream I/O interrupts + // (that should be done here, or maybe in VGA ??) + // + + Bda->CrtModeControl = 0x00; + Bda->CrtColorPaletteMask = 0x00; + Bda->VGADccIDActive = 0x08; // VGA w/ color analog active display + + /* Set the default video mode */ + VidBiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); + + /* Synchronize our cursor position with VGA */ + VidBiosSyncCursorPosition(); + + /* Register the BIOS 32-bit Interrupts */ + RegisterBiosInt32(BIOS_VIDEO_INTERRUPT, VidBiosVideoService); + + /* Vectors that should be implemented */ + RegisterBiosInt32(0x42, NULL); // Relocated Default INT 10h Video Services + RegisterBiosInt32(0x6D, NULL); // Video BIOS Entry Point + + /* Initialize VBE */ + VbeInitialized = VbeInitialize(); + if (!VbeInitialized) DPRINT1("Couldn't initialize VBE!\n"); +} + +BOOLEAN VidBiosInitialize(VOID) +{ + UCHAR Checksum; + + /* + * Initialize VGA BIOS32 static data + */ + + /* This is a ROM of size 'VIDEO_BIOS_ROM_SIZE' */ + *(PWORD)(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, 0x0000)) = 0xAA55; + *(PBYTE)(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, 0x0002)) = VIDEO_BIOS_ROM_SIZE / 512; // Size in blocks of 512 bytes + + /* Bootstrap code */ + *(PWORD)(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, 0x0003)) = 0x90CB; // retf, nop + // RtlCopyMemory(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, 0xFFF0), Bootstrap, sizeof(Bootstrap)); + + /* Video BIOS Information */ + RtlCopyMemory(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, 0x0005), BiosInfo, sizeof(BiosInfo)-1); /* Initialize the VGA static function table */ VgaStaticFuncTable = SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, VIDEO_STATE_INFO_OFFSET); @@ -3896,31 +3965,15 @@ RtlMoveMemory(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, FONT_8x14_OFFSET), Font8x14, sizeof(Font8x14)); - // - // FIXME: At the moment we always set a VGA mode. In the future, - // we should set this mode **only** when: - // - an app starts to use directly the video memory - // (that should be done in emulator.c) - // - or starts to use non-stream I/O interrupts - // (that should be done here, or maybe in VGA ??) - // - - Bda->CrtModeControl = 0x00; - Bda->CrtColorPaletteMask = 0x00; - Bda->VGADccIDActive = 0x08; // VGA w/ color analog active display - - /* Set the default video mode */ - VidBiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); - - /* Synchronize our cursor position with VGA */ - VidBiosSyncCursorPosition(); - - /* Register the BIOS support BOPs */ - RegisterBop(BOP_VIDEO_INT, VidBiosVideoService); - - /* Initialize VBE */ - VbeInitialized = VbeInitialize(); - if (!VbeInitialized) DPRINT1("Couldn't initialize VBE!\n"); + VidBios32Initialize(); + + /* Compute the ROM checksum and store it */ + *(PBYTE)(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, VIDEO_BIOS_ROM_SIZE - 1)) = 0x00; + Checksum = CalcRomChecksum(TO_LINEAR(VIDEO_BIOS_DATA_SEG, 0x0000), VIDEO_BIOS_ROM_SIZE); + *(PBYTE)(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, VIDEO_BIOS_ROM_SIZE - 1)) = (0xFF - Checksum + 1) & 0xFF; + + WriteProtectRom((PVOID)TO_LINEAR(VIDEO_BIOS_DATA_SEG, 0x0000), + VIDEO_BIOS_ROM_SIZE); return TRUE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -26,12 +26,14 @@ #define CGA_ODD_VIDEO_SEG 0xBA00 #define VIDEO_BIOS_DATA_SEG 0xC000 -#define FONT_8x8_OFFSET 0x0000 -#define FONT_8x8_HIGH_OFFSET 0x0400 -#define FONT_8x16_OFFSET 0x0800 -#define FONT_8x14_OFFSET 0x1800 +#define FONT_8x8_OFFSET 0x0100 +#define FONT_8x8_HIGH_OFFSET 0x0500 +#define FONT_8x16_OFFSET 0x0900 +#define FONT_8x14_OFFSET 0x1900 -#define VIDEO_STATE_INFO_OFFSET 0x3000 // == 0x1800 + (sizeof(Font8x14) == 0x0E00) + 0x0A00 for padding +#define VIDEO_STATE_INFO_OFFSET 0x3000 // == 0x1900 + (sizeof(Font8x14) == 0x0E00) + 0x0900 for padding + +#define VIDEO_BIOS_ROM_SIZE 0x4000 typedef enum { @@ -109,6 +111,7 @@ VOID VidBiosDetachFromConsole(VOID); VOID VidBiosAttachToConsole(VOID); +VOID VidBiosPost(VOID); BOOLEAN VidBiosInitialize(VOID); VOID VidBiosCleanup(VOID); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -222,6 +222,12 @@ break; } + case CMOS_REG_CENTURY: + { + Value = READ_CMOS_DATA(CmosMemory, CurrentTime.wYear / 100 + 19); + break; + } + case CMOS_REG_STATUS_C: { /* Return the old value */ @@ -360,6 +366,12 @@ CurrentTime.wYear = (CurrentTime.wYear / 100) * 100; CurrentTime.wYear += WRITE_CMOS_DATA(CmosMemory, Value); + break; + } + + case CMOS_REG_CENTURY: + { + UNIMPLEMENTED; break; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -18,22 +18,24 @@ #define CMOS_BATTERY_OK 0x80 /* Status Register B flags */ +#define CMOS_STB_DST (1 << 0) #define CMOS_STB_24HOUR (1 << 1) #define CMOS_STB_BINARY (1 << 2) #define CMOS_STB_SQUARE_WAVE (1 << 3) #define CMOS_STB_INT_ON_UPDATE (1 << 4) #define CMOS_STB_INT_ON_ALARM (1 << 5) #define CMOS_STB_INT_PERIODIC (1 << 6) +#define CMOS_STB_UPDATE_CYCLE (1 << 7) /* Status Register C flags */ -#define CMOS_STC_UF CMOS_STB_INT_ON_UPDATE -#define CMOS_STC_AF CMOS_STB_INT_ON_ALARM -#define CMOS_STC_PF CMOS_STB_INT_PERIODIC +#define CMOS_STC_UF (1 << 4) +#define CMOS_STC_AF (1 << 5) +#define CMOS_STC_PF (1 << 6) #define CMOS_STC_IRQF (1 << 7) /* Default register values */ -#define CMOS_DEFAULT_STA 0x26 -#define CMOS_DEFAULT_STB CMOS_STB_24HOUR +#define CMOS_DEFAULT_STA 0x26 +#define CMOS_DEFAULT_STB CMOS_STB_24HOUR #define WRITE_CMOS_DATA(Cmos, Value) \ ((Cmos).StatusRegB & CMOS_STB_BINARY) ? (Value) : BCD_TO_BINARY(Value) @@ -65,6 +67,7 @@ CMOS_REG_EXT_MEMORY_HIGH = 0x18, CMOS_REG_ACTUAL_EXT_MEMORY_LOW = 0x30, CMOS_REG_ACTUAL_EXT_MEMORY_HIGH = 0x31, + CMOS_REG_CENTURY = 0x32, CMOS_REG_MAX = 0x40 } CMOS_REGISTERS, *PCMOS_REGISTERS; @@ -107,6 +110,8 @@ BYTE StatusRegD; // 0x0d BYTE Diagnostics; // 0x0e BYTE ShutdownStatus; // 0x0f + BYTE Padding[0x22]; // 0x10 + BYTE Century; // 0x32 }; BYTE Regs1[0x10]; // 0x00 - 0x0f BYTE Regs [0x40]; // 0x00 - 0x3f Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -526,6 +526,25 @@ #endif +#ifdef ADVANCED_DEBUGGING + { + INT i = 20; + + printf("Waiting for debugger (10 secs).."); + while (i--) + { + printf("."); + if (IsDebuggerPresent()) + { + DbgBreakPoint(); + break; + } + Sleep(500); + } + printf("Continue\n"); + } +#endif + /* Load global VDM settings */ LoadGlobalSettings(); @@ -549,8 +568,8 @@ goto Cleanup; } - /* Initialize the system BIOS */ - if (!BiosInitialize(NULL)) + /* Initialize the system BIOS and option ROMs */ + if (!BiosInitialize(NULL, NULL)) { wprintf(L"FATAL: Failed to initialize the VDM BIOS.\n"); goto Cleanup; Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Tue Aug 4 20:17:05 2015 @@ -63,6 +63,10 @@ */ // #define ADVANCED_DEBUGGING +#ifdef ADVANCED_DEBUGGING +#define ADVANCED_DEBUGGING_LEVEL 1 +#endif + /* FUNCTIONS ******************************************************************/ extern HANDLE VdmTaskEvent;

1 0

[hbelusca] 68597: Remove a useless check.
by hbelusca＠svn.reactos.org 04 Aug '15

04 Aug '15

Author: hbelusca Date: Tue Aug 4 19:47:50 2015 New Revision: 68597 URL: http://svn.reactos.org/svn/reactos?rev=68597&view=rev Log: Remove a useless check. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Tue Aug 4 19:47:50 2015 @@ -373,7 +373,7 @@ RegisterBop(BOP_DOS, DosSystemBop ); RegisterBop(BOP_CMD, DosCmdInterpreterBop); - if (DosBiosFileName && DosBiosFileName[0] != '\0') + if (DosBiosFileName[0] != '\0') { BOOLEAN Success = FALSE; HANDLE hDosBios;

1 0

[hbelusca] 68596: [NTVDM]: By default, disable run-time DOS memory arena integrity checks (which was introduced along with UMB stuff in r68586).
by hbelusca＠svn.reactos.org 04 Aug '15

04 Aug '15

Author: hbelusca Date: Tue Aug 4 19:46:52 2015 New Revision: 68596 URL: http://svn.reactos.org/svn/reactos?rev=68596&view=rev Log: [NTVDM]: By default, disable run-time DOS memory arena integrity checks (which was introduced along with UMB stuff in r68586). Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Tue Aug 4 19:46:52 2015 @@ -26,6 +26,13 @@ #define FIRST_MCB_SEGMENT (SYSTEM_ENV_BLOCK + 0x200) // old value: 0x1000 #define USER_MEMORY_SIZE (0x9FFE - FIRST_MCB_SEGMENT) +/* + * Activate this line if you want run-time DOS memory arena integrity validation + * (useful to know whether this is an application, or DOS kernel itself, which + * messes up the DOS memory arena). + */ +// #define DBG_MEMORY + /* PRIVATE VARIABLES **********************************************************/ /* PUBLIC VARIABLES ***********************************************************/ @@ -41,6 +48,7 @@ * This is a helper function to help us detecting * when the DOS arena starts to become corrupted. */ +#ifdef DBG_MEMORY static VOID DosMemValidate(VOID) { WORD PrevSegment, Segment = SysVars->FirstMcb; @@ -68,6 +76,9 @@ Segment += CurrentMcb->Size + 1; } } +#else +#define DosMemValidate() +#endif static VOID DosCombineFreeBlocks(WORD StartBlock) {

1 0

[pschweitzer] 68595: [CDFS] Remove broken check. Broken cases are already handled by upper if case. This fixes the regression that leaded some valid ISOs not to be read anymore by ReactOS CORE-9254
by pschweitzer＠svn.reactos.org 02 Aug '15

02 Aug '15

Author: pschweitzer Date: Sun Aug 2 12:29:59 2015 New Revision: 68595 URL: http://svn.reactos.org/svn/reactos?rev=68595&view=rev Log: [CDFS] Remove broken check. Broken cases are already handled by upper if case. This fixes the regression that leaded some valid ISOs not to be read anymore by ReactOS CORE-9254 Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Sun Aug 2 12:29:59 2015 @@ -244,12 +244,6 @@ DPRINT1("%wc\n", ((PWSTR)Record->FileId)[0]); return FALSE; } - - if (((PWSTR)Record->FileId)[0] == UNICODE_NULL) - { - DPRINT1("Found corrupted entry!\n"); - return FALSE; - } } return TRUE;

1 0

[tfaber] 68594: [NTOS:SE] - Allow any valid ACE revision in SepPropagateAcl CORE-9955 #resolve
by tfaber＠svn.reactos.org 02 Aug '15

02 Aug '15

Author: tfaber Date: Sun Aug 2 12:17:10 2015 New Revision: 68594 URL: http://svn.reactos.org/svn/reactos?rev=68594&view=rev Log: [NTOS:SE] - Allow any valid ACE revision in SepPropagateAcl CORE-9955 #resolve Modified: trunk/reactos/ntoskrnl/se/acl.c Modified: trunk/reactos/ntoskrnl/se/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/acl.c?rev=6859… ============================================================================== --- trunk/reactos/ntoskrnl/se/acl.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/acl.c [iso-8859-1] Sun Aug 2 12:17:10 2015 @@ -417,7 +417,7 @@ NTSTATUS SepPropagateAcl( - _Out_writes_bytes_opt_(DaclLength) PACL AclDest, + _Out_writes_bytes_opt_(AclLength) PACL AclDest, _Inout_ PULONG AclLength, _In_reads_bytes_(AclSource->AclSize) PACL AclSource, _In_ PSID Owner, @@ -439,12 +439,7 @@ PSID Sid; BOOLEAN WriteTwoAces; - if (AclSource->AclRevision != ACL_REVISION) - { - NT_ASSERT(AclSource->AclRevision == ACL_REVISION); - return STATUS_UNKNOWN_REVISION; - } - + NT_ASSERT(RtlValidAcl(AclSource)); NT_ASSERT(AclSource->AclSize % sizeof(ULONG) == 0); NT_ASSERT(AclSource->Sbz1 == 0); NT_ASSERT(AclSource->Sbz2 == 0);

1 0

[tfaber] 68593: [NTOS:MM] - Don't accept 64 bit PE files on x86 (will cause use of uninitialized variable ImageBase). CORE-9955 - Remove a pointless check in MmMapViewOfSection
by tfaber＠svn.reactos.org 02 Aug '15

02 Aug '15

Author: tfaber Date: Sun Aug 2 09:15:39 2015 New Revision: 68593 URL: http://svn.reactos.org/svn/reactos?rev=68593&view=rev Log: [NTOS:MM] - Don't accept 64 bit PE files on x86 (will cause use of uninitialized variable ImageBase). CORE-9955 - Remove a pointless check in MmMapViewOfSection Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Aug 2 09:15:39 2015 @@ -363,7 +363,9 @@ switch(piohOptHeader->Magic) { case IMAGE_NT_OPTIONAL_HDR32_MAGIC: +#ifdef _WIN64 case IMAGE_NT_OPTIONAL_HDR64_MAGIC: +#endif // _WIN64 break; default: @@ -4609,13 +4611,6 @@ { MmUnlockAddressSpace(AddressSpace); return STATUS_SECTION_PROTECTION; - } - - if (ViewSize == NULL) - { - /* Following this pointer would lead to us to the dark side */ - /* What to do? Bugcheck? Return status? Do the mambo? */ - KeBugCheck(MEMORY_MANAGEMENT); } if (SectionOffset == NULL)

1 0

[aandrejevic] 68592: [NTVDM] Implement XMS function 0Fh (Reallocate Extended Memory Block).
by aandrejevic＠svn.reactos.org 01 Aug '15

01 Aug '15

Author: aandrejevic Date: Sat Aug 1 21:48:06 2015 New Revision: 68592 URL: http://svn.reactos.org/svn/reactos?rev=68592&view=rev Log: [NTVDM] Implement XMS function 0Fh (Reallocate Extended Memory Block). Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] Sat Aug 1 21:48:06 2015 @@ -272,6 +272,89 @@ return XMS_STATUS_OUT_OF_MEMORY; } +static UCHAR XmsRealloc(WORD Handle, WORD NewSize) +{ + DWORD BlockNumber; + PXMS_HANDLE HandleEntry = GetHandleRecord(Handle); + DWORD CurrentIndex = 0; + ULONG RunStart; + ULONG RunSize; + + if (!ValidateHandle(HandleEntry)) + return XMS_STATUS_INVALID_HANDLE; + + if (HandleEntry->LockCount) + return XMS_STATUS_LOCKED; + + /* Get the block number */ + BlockNumber = (HandleEntry->Address - XMS_ADDRESS) / XMS_BLOCK_SIZE; + + if (NewSize < HandleEntry->Size) + { + /* Just reduce the size of this block */ + RtlClearBits(&AllocBitmap, BlockNumber + NewSize, HandleEntry->Size - NewSize); + FreeBlocks += HandleEntry->Size - NewSize; + HandleEntry->Size = NewSize; + } + else if (NewSize > HandleEntry->Size) + { + /* Check if we can expand in-place */ + if (RtlAreBitsClear(&AllocBitmap, + BlockNumber + HandleEntry->Size, + NewSize - HandleEntry->Size)) + { + /* Just increase the size of this block */ + RtlSetBits(&AllocBitmap, + BlockNumber + HandleEntry->Size, + NewSize - HandleEntry->Size); + FreeBlocks -= NewSize - HandleEntry->Size; + HandleEntry->Size = NewSize; + + /* We're done */ + return XMS_STATUS_SUCCESS; + } + + /* Deallocate the current block range */ + RtlClearBits(&AllocBitmap, BlockNumber, HandleEntry->Size); + + /* Find a new place for this block */ + while (CurrentIndex < XMS_BLOCKS) + { + RunSize = RtlFindNextForwardRunClear(&AllocBitmap, CurrentIndex, &RunStart); + if (RunSize == 0) break; + + if (RunSize >= NewSize) + { + /* Allocate the new range */ + RtlSetBits(&AllocBitmap, RunStart, NewSize); + + /* Move the data to the new location */ + RtlMoveMemory((PVOID)REAL_TO_PHYS(XMS_ADDRESS + RunStart * XMS_BLOCK_SIZE), + (PVOID)REAL_TO_PHYS(HandleEntry->Address), + HandleEntry->Size * XMS_BLOCK_SIZE); + + /* Update the handle entry */ + HandleEntry->Address = XMS_ADDRESS + RunStart * XMS_BLOCK_SIZE; + HandleEntry->Size = NewSize; + + /* Update the free block counter */ + FreeBlocks -= NewSize - HandleEntry->Size; + + return XMS_STATUS_SUCCESS; + } + + /* Keep searching */ + CurrentIndex = RunStart + RunSize; + } + + /* Restore the old block range */ + RtlSetBits(&AllocBitmap, BlockNumber, HandleEntry->Size); + return XMS_STATUS_OUT_OF_MEMORY; + } + + return XMS_STATUS_SUCCESS; +} + static UCHAR XmsFree(WORD Handle) { DWORD BlockNumber; @@ -478,7 +561,7 @@ WORD Handle; UCHAR Result = XmsAlloc(getDX(), &Handle); - if (Result >= 0) + if (Result == XMS_STATUS_SUCCESS) { setAX(1); setDX(Handle); @@ -497,7 +580,7 @@ { UCHAR Result = XmsFree(getDX()); - setAX(Result >= 0); + setAX(Result == XMS_STATUS_SUCCESS); setBL(Result); break; } @@ -571,7 +654,7 @@ DWORD Address; UCHAR Result = XmsLock(getDX(), &Address); - if (Result >= 0) + if (Result == XMS_STATUS_SUCCESS) { setAX(1); @@ -593,7 +676,7 @@ { UCHAR Result = XmsUnlock(getDX()); - setAX(Result >= 0); + setAX(Result == XMS_STATUS_SUCCESS); setBL(Result); break; } @@ -627,40 +710,10 @@ /* Reallocate Extended Memory Block */ case 0x0F: { - PXMS_HANDLE HandleEntry = GetHandleRecord(getDX()); - WORD NewSize = getBX(); - - if (!ValidateHandle(HandleEntry)) - { - setAX(0); - setBL(XMS_STATUS_INVALID_HANDLE); - break; - } - - if (HandleEntry->LockCount) - { - setAX(0); - setBL(XMS_STATUS_LOCKED); - break; - } - - /* Check for reduction or enlargement */ - if (NewSize < HandleEntry->Size) - { - /* Reduction, the easy case: just update the size */ - HandleEntry->Size = NewSize; - } - else - { - /* Enlargement: we need to reallocate elsewhere */ - UNIMPLEMENTED; - setAX(0); - setBL(XMS_STATUS_NOT_IMPLEMENTED); - break; - } - - setAX(1); - setBL(XMS_STATUS_SUCCESS); + UCHAR Result = XmsRealloc(getDX(), getBX()); + + setAX(Result == XMS_STATUS_SUCCESS); + setBL(Result); break; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs