Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 59498: [NTVDM] Fix the TESTING case, in case you run ntvdm without other parameters.
by hbelusca＠svn.reactos.org 18 Jul '13

18 Jul '13

Author: hbelusca Date: Thu Jul 18 00:17:04 2013 New Revision: 59498 URL: http://svn.reactos.org/svn/reactos?rev=59498&view=rev Log: [NTVDM] Fix the TESTING case, in case you run ntvdm without other parameters. Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Thu Jul 18 00:17:04 2013 @@ -15,6 +15,12 @@ #include "timer.h" #include "pic.h" #include "ps2.h" + +/* + * Activate this line if you want to be able to test NTVDM with: + * ntvdm.exe <program> + */ +// #define TESTING /* PUBLIC VARIABLES ***********************************************************/ @@ -84,7 +90,16 @@ /* The DOS command line must be ASCII */ WideCharToMultiByte(CP_ACP, 0, GetCommandLine(), -1, CommandLine, 128, NULL, NULL); #else - WideCharToMultiByte(CP_ACP, 0, argv[1], -1, CommandLine, 128, NULL, NULL); + if (argc == 2 && argv[1] != NULL) + { + WideCharToMultiByte(CP_ACP, 0, argv[1], -1, CommandLine, 128, NULL, NULL); + } + else + { + wprintf(L"\nReactOS Virtual DOS Machine\n\n" + L"Usage: NTVDM <executable>\n"); + return 0; + } #endif if (!EmulatorInitialize())

1 0

[aandrejevic] 59497: [NTVDM] Add a compile-time option (not default) to run ntvdm manually with the target executable as a parameter. Fix screen clearing bug. Rewrite several INT 10h functions to w...
by aandrejevic＠svn.reactos.org 18 Jul '13

18 Jul '13

Author: aandrejevic Date: Thu Jul 18 00:01:18 2013 New Revision: 59497 URL: http://svn.reactos.org/svn/reactos?rev=59497&view=rev Log: [NTVDM] Add a compile-time option (not default) to run ntvdm manually with the target executable as a parameter. Fix screen clearing bug. Rewrite several INT 10h functions to work for all video pages. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Thu Jul 18 00:01:18 2013 @@ -661,11 +661,10 @@ VOID BiosVideoService() { - INT CursorHeight; + INT i, CursorHeight; BOOLEAN Invisible = FALSE; COORD Position; CONSOLE_CURSOR_INFO CursorInfo; - CONSOLE_SCREEN_BUFFER_INFO ScreenBufferInfo; CHAR_INFO Character; SMALL_RECT Rect; DWORD Eax = EmulatorGetRegister(EMULATOR_REG_AX); @@ -673,7 +672,6 @@ DWORD Edx = EmulatorGetRegister(EMULATOR_REG_DX); DWORD Ebx = EmulatorGetRegister(EMULATOR_REG_BX); - // TODO: Add support for multiple pages! switch (HIBYTE(Eax)) { /* Set Video Mode */ @@ -691,6 +689,10 @@ CursorHeight = (HIBYTE(Ecx) & 0x1F) - (LOBYTE(Ecx) & 0x1F); if (CursorHeight < 1) CursorHeight = 1; if (CursorHeight > 100) CursorHeight = 100; + + /* Update the BDA */ + Bda->CursorStartLine = HIBYTE(Ecx); + Bda->CursorEndLine = LOBYTE(Ecx) & 0x1F; /* Set the cursor */ CursorInfo.dwSize = (CursorHeight * 100) / CONSOLE_FONT_HEIGHT; @@ -723,20 +725,13 @@ /* Get Cursor Position */ case 0x03: { - INT StartLine; - /* Make sure the selected video page exists */ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - /* Retrieve the data */ - GetConsoleCursorInfo(BiosConsoleOutput, &CursorInfo); - - /* Find the first line */ - StartLine = 32 - ((CursorInfo.dwSize * 32) / 100); - /* Return the result */ EmulatorSetRegister(EMULATOR_REG_AX, 0); - EmulatorSetRegister(EMULATOR_REG_CX, (StartLine << 8) | 0x1F); + EmulatorSetRegister(EMULATOR_REG_CX, + (Bda->CursorStartLine << 8) | Bda->CursorEndLine); EmulatorSetRegister(EMULATOR_REG_DX, Bda->CursorPosition[HIBYTE(Ebx)]); break; @@ -758,9 +753,12 @@ } /* Scroll Up/Down Window */ + // TODO: Implement for different pages case 0x06: case 0x07: { + BYTE Lines = LOBYTE(Eax); + Rect.Top = HIBYTE(Ecx); Rect.Left = LOBYTE(Ecx); Rect.Bottom = HIBYTE(Edx); @@ -769,115 +767,94 @@ Character.Attributes = HIBYTE(Ebx); Position.X = Rect.Left; - if (HIBYTE(Eax) == 0x06) Position.Y = Rect.Top - LOBYTE(Eax); - else Position.Y = Rect.Top + LOBYTE(Eax); + /* 0 means clear entire window */ + if (Lines == 0) Lines = Rect.Bottom - Rect.Top; + + if (HIBYTE(Eax) == 0x06) Position.Y = Rect.Top - Lines; + else Position.Y = Rect.Top + Lines; ScrollConsoleScreenBuffer(BiosConsoleOutput, &Rect, &Rect, Position, &Character); + break; } /* Read Character And Attribute At Cursor Position */ case 0x08: { - COORD BufferSize = { 1, 1 }, Origin = { 0, 0 }; + DWORD Address; + + /* Make sure this is text mode */ + if (!VideoModes[CurrentVideoMode].Text) break; /* Make sure the selected video page exists */ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - - if (HIBYTE(Ebx) == CurrentVideoPage) - { - /* Get the cursor position */ - GetConsoleScreenBufferInfo(BiosConsoleOutput, - &ScreenBufferInfo); - - /* Read at cursor position */ - Rect.Left = ScreenBufferInfo.dwCursorPosition.X; - Rect.Top = ScreenBufferInfo.dwCursorPosition.Y; - /* Read the console output */ - ReadConsoleOutput(BiosConsoleOutput, - &Character, - BufferSize, - Origin, - &Rect); - - /* Return the result */ - EmulatorSetRegister(EMULATOR_REG_AX, - (LOBYTE(Character.Attributes) << 8) - | Character.Char.AsciiChar); - } - else - { - // TODO: NOT IMPLEMENTED - } + /* Find the address */ + Address = BiosGetVideoMemoryStart() + + HIBYTE(Ebx) * BiosGetVideoPageSize() + + (HIBYTE(Bda->CursorPosition[HIBYTE(Ebx)]) + * VideoModes[CurrentVideoMode].Height + + LOBYTE(Bda->CursorPosition[HIBYTE(Ebx)])) + * VideoModes[CurrentVideoMode].Bpp / 8; + + /* Update the video memory at that address */ + BiosUpdateVideoMemory(Address, + Address + VideoModes[CurrentVideoMode].Bpp / 8); + + /* Return the result in AX */ + EmulatorSetRegister(EMULATOR_REG_AX, + *((LPWORD)((ULONG_PTR)BaseAddress + Address))); break; } /* Write Character And Attribute At Cursor Position */ case 0x09: - { - DWORD CharsWritten; + case 0x0A: + { + BYTE PixelSize = VideoModes[CurrentVideoMode].Bpp / 8; + WORD Data = (LOBYTE(Ebx) << 8) | LOBYTE(Eax); + WORD Repeat = LOWORD(Ecx); + DWORD Address = BiosGetVideoMemoryStart() + + CurrentVideoPage * BiosGetVideoPageSize() + + (HIBYTE(Bda->CursorPosition[CurrentVideoPage]) + * VideoModes[CurrentVideoMode].Height + + LOBYTE(Bda->CursorPosition[CurrentVideoPage])) + * PixelSize; + + /* Make sure this is text mode */ + if (!VideoModes[CurrentVideoMode].Text) break; /* Make sure the selected video page exists */ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - if (HIBYTE(Ebx) == CurrentVideoPage) + /* Make sure we don't write over the end of video memory */ + Repeat = min(Repeat, + (CONSOLE_VIDEO_MEM_END - Address) + / PixelSize); + + /* Copy the values to the memory */ + for (i = 0; i < Repeat; i++) { - /* Get the cursor position */ - GetConsoleScreenBufferInfo(BiosConsoleOutput, - &ScreenBufferInfo); - - /* Write the attribute to the output */ - FillConsoleOutputAttribute(BiosConsoleOutput, - LOBYTE(Ebx), - LOWORD(Ecx), - ScreenBufferInfo.dwCursorPosition, - &CharsWritten); - - /* Write the character to the output */ - FillConsoleOutputCharacterA(BiosConsoleOutput, - LOBYTE(Eax), - LOWORD(Ecx), - ScreenBufferInfo.dwCursorPosition, - &CharsWritten); + if (PixelSize == sizeof(BYTE) || HIBYTE(Eax) == 0x0A) + { + /* Just characters, no attributes */ + *((LPBYTE)((ULONG_PTR)BaseAddress + Address) + i * PixelSize) = LOBYTE(Data); + } + else if (PixelSize == sizeof(WORD)) + { + /* First byte for characters, second for attributes */ + *((LPWORD)((ULONG_PTR)BaseAddress + Address) + i) = Data; + } } - else - { - // TODO: NOT IMPLEMENTED - } - - break; - } - - /* Write Character Only At Cursor Position */ - case 0x0A: - { - DWORD CharsWritten; - - /* Make sure the selected video page exists */ - if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - - if (HIBYTE(Ebx) == CurrentVideoPage) - { - /* Get the cursor position */ - GetConsoleScreenBufferInfo(BiosConsoleOutput, &ScreenBufferInfo); - - /* Write the character to the output */ - FillConsoleOutputCharacterA(BiosConsoleOutput, - LOBYTE(Eax), - LOWORD(Ecx), - ScreenBufferInfo.dwCursorPosition, - &CharsWritten); - } - else - { - // TODO: NOT IMPLEMENTED - } + + /* Update the range */ + BiosUpdateConsole(Address, + Address + Repeat * (VideoModes[CurrentVideoMode].Bpp / 8)); break; } @@ -911,6 +888,32 @@ MAKEWORD(Bda->VideoMode, Bda->ScreenColumns)); EmulatorSetRegister(EMULATOR_REG_BX, MAKEWORD(LOBYTE(Ebx), Bda->VideoPage)); + + break; + } + + /* Scroll Window */ + case 0x12: + { + Rect.Top = HIBYTE(Ecx); + Rect.Left = LOBYTE(Ecx); + Rect.Bottom = HIBYTE(Edx); + Rect.Right = LOBYTE(Edx); + Character.Char.UnicodeChar = L' '; + Character.Attributes = 0x07; + Position.X = Rect.Left; + Position.Y = Rect.Top; + + if (LOBYTE(Ebx) == 0) Position.Y -= LOBYTE(Eax); + else if (LOBYTE(Ebx) == 1) Position.Y += LOBYTE(Eax); + else if (LOBYTE(Ebx) == 2) Position.X -= LOBYTE(Eax); + else if (LOBYTE(Ebx) == 3) Position.X += LOBYTE(Eax); + + ScrollConsoleScreenBuffer(BiosConsoleOutput, + &Rect, + &Rect, + Position, + &Character); break; } Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Thu Jul 18 00:01:18 2013 @@ -1393,10 +1393,14 @@ if (Segment != 0) { EmulatorSetRegister(EMULATOR_REG_AX, Segment); + EmulatorClearFlag(EMULATOR_FLAG_CF); + } + else + { + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_NOT_ENOUGH_MEMORY); EmulatorSetRegister(EMULATOR_REG_BX, MaxAvailable); - EmulatorClearFlag(EMULATOR_FLAG_CF); - } - else EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetFlag(EMULATOR_FLAG_CF); + } break; } Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Thu Jul 18 00:01:18 2013 @@ -80,8 +80,12 @@ /* Set the handler routine */ SetConsoleCtrlHandler(ConsoleCtrlHandler, TRUE); +#ifndef TESTING /* The DOS command line must be ASCII */ WideCharToMultiByte(CP_ACP, 0, GetCommandLine(), -1, CommandLine, 128, NULL, NULL); +#else + WideCharToMultiByte(CP_ACP, 0, argv[1], -1, CommandLine, 128, NULL, NULL); +#endif if (!EmulatorInitialize()) {

1 0

[akhaldi] 59496: [RSYM] * Formatting. No intended code changes.
by akhaldi＠svn.reactos.org 17 Jul '13

17 Jul '13

Author: akhaldi Date: Wed Jul 17 14:42:33 2013 New Revision: 59496 URL: http://svn.reactos.org/svn/reactos?rev=59496&view=rev Log: [RSYM] * Formatting. No intended code changes. Modified: trunk/reactos/tools/rsym/rsym.c Modified: trunk/reactos/tools/rsym/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.c?rev=5949… ============================================================================== --- trunk/reactos/tools/rsym/rsym.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym.c [iso-8859-1] Wed Jul 17 14:42:33 2013 @@ -30,17 +30,17 @@ static int CompareSymEntry(const PROSSYM_ENTRY SymEntry1, const PROSSYM_ENTRY SymEntry2) { - if (SymEntry1->Address < SymEntry2->Address) - { - return -1; - } - - if (SymEntry2->Address < SymEntry1->Address) - { - return +1; - } - - return 0; + if (SymEntry1->Address < SymEntry2->Address) + { + return -1; + } + + if (SymEntry2->Address < SymEntry1->Address) + { + return +1; + } + + return 0; } static int @@ -49,38 +49,36 @@ ULONG *StabSymbolsLength, void **StabSymbolsBase, ULONG *StabStringsLength, void **StabStringsBase) { - ULONG Idx; - - /* Load .stab and .stabstr sections if available */ - *StabSymbolsBase = NULL; - *StabSymbolsLength = 0; - *StabStringsBase = NULL; - *StabStringsLength = 0; - - for (Idx = 0; Idx < PEFileHeader->NumberOfSections; Idx++) - { - /* printf("section: '%.08s'\n", PESectionHeaders[Idx].Name); */ - if ((strncmp((char *) PESectionHeaders[Idx].Name, ".stab", 5) == 0) - && (PESectionHeaders[Idx].Name[5] == 0)) - { - /* printf(".stab section found. Size %d\n", - PESectionHeaders[Idx].SizeOfRawData); */ - - *StabSymbolsLength = PESectionHeaders[Idx].SizeOfRawData; - *StabSymbolsBase = (void *)((char *) FileData + PESectionHeaders[Idx].PointerToRawData); - } - - if (strncmp((char *) PESectionHeaders[Idx].Name, ".stabstr", 8) == 0) - { - /* printf(".stabstr section found. Size %d\n", - PESectionHeaders[Idx].SizeOfRawData); */ - - *StabStringsLength = PESectionHeaders[Idx].SizeOfRawData; - *StabStringsBase = (void *)((char *) FileData + PESectionHeaders[Idx].PointerToRawData); - } - } - - return 0; + ULONG Idx; + + /* Load .stab and .stabstr sections if available */ + *StabSymbolsBase = NULL; + *StabSymbolsLength = 0; + *StabStringsBase = NULL; + *StabStringsLength = 0; + + for (Idx = 0; Idx < PEFileHeader->NumberOfSections; Idx++) + { + /* printf("section: '%.08s'\n", PESectionHeaders[Idx].Name); */ + if ((strncmp((char *) PESectionHeaders[Idx].Name, ".stab", 5) == 0) + && (PESectionHeaders[Idx].Name[5] == 0)) + { + /* printf(".stab section found. Size %d\n", PESectionHeaders[Idx].SizeOfRawData); */ + + *StabSymbolsLength = PESectionHeaders[Idx].SizeOfRawData; + *StabSymbolsBase = (void *)((char *) FileData + PESectionHeaders[Idx].PointerToRawData); + } + + if (strncmp((char *) PESectionHeaders[Idx].Name, ".stabstr", 8) == 0) + { + /* printf(".stabstr section found. Size %d\n", PESectionHeaders[Idx].SizeOfRawData); */ + + *StabStringsLength = PESectionHeaders[Idx].SizeOfRawData; + *StabStringsBase = (void *)((char *) FileData + PESectionHeaders[Idx].PointerToRawData); + } + } + + return 0; } static int @@ -90,44 +88,44 @@ ULONG *CoffStringsLength, void **CoffStringsBase) { - if (0 == PEFileHeader->PointerToSymbolTable || 0 == PEFileHeader->NumberOfSymbols) - { - /* No COFF symbol table */ - *CoffSymbolsLength = 0; - *CoffStringsLength = 0; - } - else - { - *CoffSymbolsLength = PEFileHeader->NumberOfSymbols * sizeof(COFF_SYMENT); - *CoffSymbolsBase = (void *)((char *) FileData + PEFileHeader->PointerToSymbolTable); - *CoffStringsLength = *((ULONG *) ((char *) *CoffSymbolsBase + *CoffSymbolsLength)); - *CoffStringsBase = (void *)((char *) *CoffSymbolsBase + *CoffSymbolsLength); - } - - return 0; + if (PEFileHeader->PointerToSymbolTable == 0 || PEFileHeader->NumberOfSymbols == 0) + { + /* No COFF symbol table */ + *CoffSymbolsLength = 0; + *CoffStringsLength = 0; + } + else + { + *CoffSymbolsLength = PEFileHeader->NumberOfSymbols * sizeof(COFF_SYMENT); + *CoffSymbolsBase = (void *)((char *) FileData + PEFileHeader->PointerToSymbolTable); + *CoffStringsLength = *((ULONG *) ((char *) *CoffSymbolsBase + *CoffSymbolsLength)); + *CoffStringsBase = (void *)((char *) *CoffSymbolsBase + *CoffSymbolsLength); + } + + return 0; } static ULONG FindOrAddString(char *StringToFind, ULONG *StringsLength, void *StringsBase) { - char *Search, *End; - - Search = (char *) StringsBase; - End = Search + *StringsLength; - - while (Search < End) - { - if (0 == strcmp(Search, StringToFind)) - { - return Search - (char *) StringsBase; - } - Search += strlen(Search) + 1; - } - - strcpy(Search, StringToFind); - *StringsLength += strlen(StringToFind) + 1; - - return Search - (char *) StringsBase; + char *Search, *End; + + Search = (char *)StringsBase; + End = Search + *StringsLength; + + while (Search < End) + { + if (strcmp(Search, StringToFind) == 0) + { + return Search - (char *)StringsBase; + } + Search += strlen(Search) + 1; + } + + strcpy(Search, StringToFind); + *StringsLength += strlen(StringToFind) + 1; + + return Search - (char *)StringsBase; } static int @@ -138,129 +136,130 @@ ULONG_PTR ImageBase, PIMAGE_FILE_HEADER PEFileHeader, PIMAGE_SECTION_HEADER PESectionHeaders) { - PSTAB_ENTRY StabEntry; - ULONG Count, i; - ULONG_PTR Address, LastFunctionAddress; - int First = 1; - char *Name; - ULONG NameLen; - char FuncName[256]; - PROSSYM_ENTRY Current; - - StabEntry = StabSymbolsBase; - Count = StabSymbolsLength / sizeof(STAB_ENTRY); - *SymbolsCount = 0; - if (Count == 0) - { - /* No symbol info */ - *SymbolsBase = NULL; - return 0; - } - - *SymbolsBase = malloc(Count * sizeof(ROSSYM_ENTRY)); - if (NULL == *SymbolsBase) - { - fprintf(stderr, "Failed to allocate memory for converted .stab symbols\n"); - return 1; - } - Current = *SymbolsBase; - memset ( Current, 0, sizeof(*Current) ); - - LastFunctionAddress = 0; - for (i = 0; i < Count; i++) - { - if ( 0 == LastFunctionAddress ) - { - Address = StabEntry[i].n_value - ImageBase; - } - else - { - Address = LastFunctionAddress + StabEntry[i].n_value; - } - switch (StabEntry[i].n_type) - { - case N_SO: - case N_SOL: - case N_BINCL: - Name = (char *) StabStringsBase + StabEntry[i].n_strx; - if (StabStringsLength < StabEntry[i].n_strx - ||'\0' == *Name || '/' == Name[strlen(Name) - 1] - || '\\' == Name[strlen(Name) - 1] - || StabEntry[i].n_value < ImageBase) - { - continue; - } - if ( First || Address != Current->Address ) - { - if ( !First ) - { - memset ( ++Current, 0, sizeof(*Current) ); - Current->FunctionOffset = Current[-1].FunctionOffset; - } - else - First = 0; - Current->Address = Address; - } - Current->FileOffset = FindOrAddString((char *)StabStringsBase - + StabEntry[i].n_strx, - StringsLength, - StringsBase); - break; - case N_FUN: - if (0 == StabEntry[i].n_desc || StabEntry[i].n_value < ImageBase) - { - LastFunctionAddress = 0; /* line # 0 = end of function */ - continue; - } - if ( First || Address != Current->Address ) - { - if ( !First ) - memset ( ++Current, 0, sizeof(*Current) ); - else - First = 0; - Current->Address = Address; - Current->FileOffset = Current[-1].FileOffset; - } - Name = (char *) StabStringsBase + StabEntry[i].n_strx; - NameLen = strcspn(Name, ":"); - if (sizeof(FuncName) <= NameLen) - { - free(*SymbolsBase); - fprintf(stderr, "Function name too long\n"); - return 1; - } - memcpy(FuncName, Name, NameLen); - FuncName[NameLen] = '\0'; - Current->FunctionOffset = FindOrAddString(FuncName, + PSTAB_ENTRY StabEntry; + ULONG Count, i; + ULONG_PTR Address, LastFunctionAddress; + int First = 1; + char *Name; + ULONG NameLen; + char FuncName[256]; + PROSSYM_ENTRY Current; + + StabEntry = StabSymbolsBase; + Count = StabSymbolsLength / sizeof(STAB_ENTRY); + *SymbolsCount = 0; + + if (Count == 0) + { + /* No symbol info */ + *SymbolsBase = NULL; + return 0; + } + + *SymbolsBase = malloc(Count * sizeof(ROSSYM_ENTRY)); + if (*SymbolsBase == NULL) + { + fprintf(stderr, "Failed to allocate memory for converted .stab symbols\n"); + return 1; + } + Current = *SymbolsBase; + memset(Current, 0, sizeof(*Current)); + + LastFunctionAddress = 0; + for (i = 0; i < Count; i++) + { + if (LastFunctionAddress == 0) + { + Address = StabEntry[i].n_value - ImageBase; + } + else + { + Address = LastFunctionAddress + StabEntry[i].n_value; + } + switch (StabEntry[i].n_type) + { + case N_SO: + case N_SOL: + case N_BINCL: + Name = (char *) StabStringsBase + StabEntry[i].n_strx; + if (StabStringsLength < StabEntry[i].n_strx + || *Name == '\0' || Name[strlen(Name) - 1] == '/' + || Name[strlen(Name) - 1] == '\\' + || StabEntry[i].n_value < ImageBase) + { + continue; + } + if (First || Address != Current->Address) + { + if (!First) + { + memset(++Current, 0, sizeof(*Current)); + Current->FunctionOffset = Current[-1].FunctionOffset; + } + else + First = 0; + Current->Address = Address; + } + Current->FileOffset = FindOrAddString((char *)StabStringsBase + + StabEntry[i].n_strx, StringsLength, StringsBase); - Current->SourceLine = 0; - LastFunctionAddress = Address; - break; - case N_SLINE: - if ( First || Address != Current->Address ) - { - if ( !First ) - { - memset ( ++Current, 0, sizeof(*Current) ); + break; + case N_FUN: + if (StabEntry[i].n_desc == 0 || StabEntry[i].n_value < ImageBase) + { + LastFunctionAddress = 0; /* line # 0 = end of function */ + continue; + } + if (First || Address != Current->Address) + { + if (!First) + memset(++Current, 0, sizeof(*Current)); + else + First = 0; + Current->Address = Address; Current->FileOffset = Current[-1].FileOffset; - Current->FunctionOffset = Current[-1].FunctionOffset; - } - else - First = 0; - Current->Address = Address; - } - Current->SourceLine = StabEntry[i].n_desc; - break; - default: - continue; - } - } - *SymbolsCount = (Current - *SymbolsBase + 1); - - qsort(*SymbolsBase, *SymbolsCount, sizeof(ROSSYM_ENTRY), (int (*)(const void *, const void *)) CompareSymEntry); - - return 0; + } + Name = (char *)StabStringsBase + StabEntry[i].n_strx; + NameLen = strcspn(Name, ":"); + if (sizeof(FuncName) <= NameLen) + { + free(*SymbolsBase); + fprintf(stderr, "Function name too long\n"); + return 1; + } + memcpy(FuncName, Name, NameLen); + FuncName[NameLen] = '\0'; + Current->FunctionOffset = FindOrAddString(FuncName, + StringsLength, + StringsBase); + Current->SourceLine = 0; + LastFunctionAddress = Address; + break; + case N_SLINE: + if (First || Address != Current->Address) + { + if (!First) + { + memset(++Current, 0, sizeof(*Current)); + Current->FileOffset = Current[-1].FileOffset; + Current->FunctionOffset = Current[-1].FunctionOffset; + } + else + First = 0; + Current->Address = Address; + } + Current->SourceLine = StabEntry[i].n_desc; + break; + default: + continue; + } + } + *SymbolsCount = (Current - *SymbolsBase + 1); + + qsort(*SymbolsBase, *SymbolsCount, sizeof(ROSSYM_ENTRY), (int (*)(const void *, const void *)) CompareSymEntry); + + return 0; } static int @@ -271,76 +270,80 @@ ULONG_PTR ImageBase, PIMAGE_FILE_HEADER PEFileHeader, PIMAGE_SECTION_HEADER PESectionHeaders) { - ULONG Count, i; - PCOFF_SYMENT CoffEntry; - char FuncName[256]; - char *p; - PROSSYM_ENTRY Current; - - CoffEntry = (PCOFF_SYMENT) CoffSymbolsBase; - Count = CoffSymbolsLength / sizeof(COFF_SYMENT); - *SymbolsBase = malloc(Count * sizeof(ROSSYM_ENTRY)); - if (NULL == *SymbolsBase) - { - fprintf(stderr, "Unable to allocate memory for converted COFF symbols\n"); - return 1; - } - *SymbolsCount = 0; - Current = *SymbolsBase; - - for (i = 0; i < Count; i++) - { - if (ISFCN(CoffEntry[i].e_type) || C_EXT == CoffEntry[i].e_sclass) - { - Current->Address = CoffEntry[i].e_value; - if (0 < CoffEntry[i].e_scnum) - { - if (PEFileHeader->NumberOfSections < CoffEntry[i].e_scnum) + ULONG Count, i; + PCOFF_SYMENT CoffEntry; + char FuncName[256]; + char *p; + PROSSYM_ENTRY Current; + + CoffEntry = (PCOFF_SYMENT) CoffSymbolsBase; + Count = CoffSymbolsLength / sizeof(COFF_SYMENT); + + *SymbolsBase = malloc(Count * sizeof(ROSSYM_ENTRY)); + if (*SymbolsBase == NULL) + { + fprintf(stderr, "Unable to allocate memory for converted COFF symbols\n"); + return 1; + } + *SymbolsCount = 0; + Current = *SymbolsBase; + + for (i = 0; i < Count; i++) + { + if (ISFCN(CoffEntry[i].e_type) || C_EXT == CoffEntry[i].e_sclass) + { + Current->Address = CoffEntry[i].e_value; + if (CoffEntry[i].e_scnum > 0) + { + if (PEFileHeader->NumberOfSections < CoffEntry[i].e_scnum) { - free(*SymbolsBase); - fprintf(stderr, "Invalid section number %d in COFF symbols (only %d sections present)\n", - CoffEntry[i].e_scnum, PEFileHeader->NumberOfSections); - return 1; + free(*SymbolsBase); + fprintf(stderr, + "Invalid section number %d in COFF symbols (only %d sections present)\n", + CoffEntry[i].e_scnum, + PEFileHeader->NumberOfSections); + return 1; } - Current->Address += PESectionHeaders[CoffEntry[i].e_scnum - 1].VirtualAddress; - } - Current->FileOffset = 0; - if (0 == CoffEntry[i].e.e.e_zeroes) - { - if (sizeof(FuncName) <= strlen((char *) CoffStringsBase + CoffEntry[i].e.e.e_offset)) + Current->Address += PESectionHeaders[CoffEntry[i].e_scnum - 1].VirtualAddress; + } + Current->FileOffset = 0; + if (CoffEntry[i].e.e.e_zeroes == 0) + { + if (sizeof(FuncName) <= strlen((char *) CoffStringsBase + CoffEntry[i].e.e.e_offset)) { - free(*SymbolsBase); - fprintf(stderr, "Function name too long\n"); - return 1; + free(*SymbolsBase); + fprintf(stderr, "Function name too long\n"); + return 1; } - strcpy(FuncName, (char *) CoffStringsBase + CoffEntry[i].e.e.e_offset); - } - else - { - memcpy(FuncName, CoffEntry[i].e.e_name, E_SYMNMLEN); - FuncName[E_SYMNMLEN] = '\0'; - } - - /* Name demangling: stdcall */ - p = strrchr(FuncName, '@'); - if (NULL != p) - { - *p = '\0'; - } - p = ('_' == FuncName[0] || '@' == FuncName[0] ? FuncName + 1 : FuncName); - Current->FunctionOffset = FindOrAddString(p, - StringsLength, - StringsBase); - Current->SourceLine = 0; - memset ( ++Current, 0, sizeof(*Current) ); - } - i += CoffEntry[i].e_numaux; - } - - *SymbolsCount = (Current - *SymbolsBase + 1); - qsort(*SymbolsBase, *SymbolsCount, sizeof(ROSSYM_ENTRY), (int (*)(const void *, const void *)) CompareSymEntry); - - return 0; + strcpy(FuncName, (char *) CoffStringsBase + CoffEntry[i].e.e.e_offset); + } + else + { + memcpy(FuncName, CoffEntry[i].e.e_name, E_SYMNMLEN); + FuncName[E_SYMNMLEN] = '\0'; + } + + /* Name demangling: stdcall */ + p = strrchr(FuncName, '@'); + if (p != NULL) + { + *p = '\0'; + } + p = ('_' == FuncName[0] || '@' == FuncName[0] ? FuncName + 1 : FuncName); + Current->FunctionOffset = FindOrAddString(p, + StringsLength, + StringsBase); + Current->SourceLine = 0; + memset(++Current, 0, sizeof(*Current)); + } + + i += CoffEntry[i].e_numaux; + } + + *SymbolsCount = (Current - *SymbolsBase + 1); + qsort(*SymbolsBase, *SymbolsCount, sizeof(ROSSYM_ENTRY), (int (*)(const void *, const void *)) CompareSymEntry); + + return 0; } static int @@ -348,87 +351,88 @@ ULONG StabSymbolsCount, PROSSYM_ENTRY StabSymbols, ULONG CoffSymbolsCount, PROSSYM_ENTRY CoffSymbols) { - ULONG StabIndex, j; - ULONG CoffIndex; - ULONG_PTR StabFunctionStartAddress; - ULONG StabFunctionStringOffset, NewStabFunctionStringOffset; - - *MergedSymbolCount = 0; - if (StabSymbolsCount == 0) - { - *MergedSymbols = NULL; - return 0; - } - *MergedSymbols = malloc(StabSymbolsCount * sizeof(ROSSYM_ENTRY)); - if (NULL == *MergedSymbols) - { - fprintf(stderr, "Unable to allocate memory for merged symbols\n"); - return 1; - } - - StabFunctionStartAddress = 0; - StabFunctionStringOffset = 0; - CoffIndex = 0; - for (StabIndex = 0; StabIndex < StabSymbolsCount; StabIndex++) - { - (*MergedSymbols)[*MergedSymbolCount] = StabSymbols[StabIndex]; - for (j = StabIndex + 1; - j < StabSymbolsCount && StabSymbols[j].Address == StabSymbols[StabIndex].Address; - j++) - { - if (0 != StabSymbols[j].FileOffset && 0 == (*MergedSymbols)[*MergedSymbolCount].FileOffset) - { - (*MergedSymbols)[*MergedSymbolCount].FileOffset = StabSymbols[j].FileOffset; - } - if (0 != StabSymbols[j].FunctionOffset && 0 == (*MergedSymbols)[*MergedSymbolCount].FunctionOffset) - { - (*MergedSymbols)[*MergedSymbolCount].FunctionOffset = StabSymbols[j].FunctionOffset; - } - if (0 != StabSymbols[j].SourceLine && 0 == (*MergedSymbols)[*MergedSymbolCount].SourceLine) - { - (*MergedSymbols)[*MergedSymbolCount].SourceLine = StabSymbols[j].SourceLine; - } - } - StabIndex = j - 1; - while (CoffIndex < CoffSymbolsCount - && CoffSymbols[CoffIndex + 1].Address <= (*MergedSymbols)[*MergedSymbolCount].Address) - { - CoffIndex++; - } - NewStabFunctionStringOffset = (*MergedSymbols)[*MergedSymbolCount].FunctionOffset; - if (CoffSymbolsCount > 0 && - CoffSymbols[CoffIndex].Address < (*MergedSymbols)[*MergedSymbolCount].Address - && StabFunctionStartAddress < CoffSymbols[CoffIndex].Address - && 0 != CoffSymbols[CoffIndex].FunctionOffset) - { - (*MergedSymbols)[*MergedSymbolCount].FunctionOffset = CoffSymbols[CoffIndex].FunctionOffset; - } - if (StabFunctionStringOffset != NewStabFunctionStringOffset) - { - StabFunctionStartAddress = (*MergedSymbols)[*MergedSymbolCount].Address; - } - StabFunctionStringOffset = NewStabFunctionStringOffset; - (*MergedSymbolCount)++; - } - - return 0; + ULONG StabIndex, j; + ULONG CoffIndex; + ULONG_PTR StabFunctionStartAddress; + ULONG StabFunctionStringOffset, NewStabFunctionStringOffset; + + *MergedSymbolCount = 0; + if (StabSymbolsCount == 0) + { + *MergedSymbols = NULL; + return 0; + } + *MergedSymbols = malloc(StabSymbolsCount * sizeof(ROSSYM_ENTRY)); + if (*MergedSymbols == NULL) + { + fprintf(stderr, "Unable to allocate memory for merged symbols\n"); + return 1; + } + + StabFunctionStartAddress = 0; + StabFunctionStringOffset = 0; + CoffIndex = 0; + for (StabIndex = 0; StabIndex < StabSymbolsCount; StabIndex++) + { + (*MergedSymbols)[*MergedSymbolCount] = StabSymbols[StabIndex]; + for (j = StabIndex + 1; + j < StabSymbolsCount && StabSymbols[j].Address == StabSymbols[StabIndex].Address; + j++) + { + if (StabSymbols[j].FileOffset != 0 && (*MergedSymbols)[*MergedSymbolCount].FileOffset == 0) + { + (*MergedSymbols)[*MergedSymbolCount].FileOffset = StabSymbols[j].FileOffset; + } + if (StabSymbols[j].FunctionOffset != 0 && (*MergedSymbols)[*MergedSymbolCount].FunctionOffset == 0) + { + (*MergedSymbols)[*MergedSymbolCount].FunctionOffset = StabSymbols[j].FunctionOffset; + } + if (StabSymbols[j].SourceLine != 0 && (*MergedSymbols)[*MergedSymbolCount].SourceLine == 0) + { + (*MergedSymbols)[*MergedSymbolCount].SourceLine = StabSymbols[j].SourceLine; + } + } + StabIndex = j - 1; + + while (CoffIndex < CoffSymbolsCount && + CoffSymbols[CoffIndex + 1].Address <= (*MergedSymbols)[*MergedSymbolCount].Address) + { + CoffIndex++; + } + NewStabFunctionStringOffset = (*MergedSymbols)[*MergedSymbolCount].FunctionOffset; + if (CoffSymbolsCount > 0 && + CoffSymbols[CoffIndex].Address < (*MergedSymbols)[*MergedSymbolCount].Address && + StabFunctionStartAddress < CoffSymbols[CoffIndex].Address && + CoffSymbols[CoffIndex].FunctionOffset != 0) + { + (*MergedSymbols)[*MergedSymbolCount].FunctionOffset = CoffSymbols[CoffIndex].FunctionOffset; + } + if (StabFunctionStringOffset != NewStabFunctionStringOffset) + { + StabFunctionStartAddress = (*MergedSymbols)[*MergedSymbolCount].Address; + } + StabFunctionStringOffset = NewStabFunctionStringOffset; + (*MergedSymbolCount)++; + } + + return 0; } static PIMAGE_SECTION_HEADER FindSectionForRVA(DWORD RVA, unsigned NumberOfSections, PIMAGE_SECTION_HEADER SectionHeaders) { - unsigned Section; - - for (Section = 0; Section < NumberOfSections; Section++) - { - if (SectionHeaders[Section].VirtualAddress <= RVA && - RVA < SectionHeaders[Section].VirtualAddress + SectionHeaders[Section].Misc.VirtualSize) - { - return SectionHeaders + Section; - } - } - - return NULL; + unsigned Section; + + for (Section = 0; Section < NumberOfSections; Section++) + { + if (SectionHeaders[Section].VirtualAddress <= RVA && + RVA < SectionHeaders[Section].VirtualAddress + SectionHeaders[Section].Misc.VirtualSize) + { + return SectionHeaders + Section; + } + } + + return NULL; } static int @@ -436,70 +440,74 @@ void *RawData, PIMAGE_OPTIONAL_HEADER OptHeader, unsigned NumberOfSections, PIMAGE_SECTION_HEADER SectionHeaders) { - PIMAGE_SECTION_HEADER RelocSectionHeader, TargetSectionHeader; - PIMAGE_BASE_RELOCATION BaseReloc, End, AcceptedRelocs; - int Found; - - if (OptHeader->NumberOfRvaAndSizes < IMAGE_DIRECTORY_ENTRY_BASERELOC - || 0 == OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress) - { - /* No relocation entries */ - *ProcessedRelocsLength = 0; - *ProcessedRelocs = NULL; - return 0; - } - - RelocSectionHeader = FindSectionForRVA(OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress, - NumberOfSections, SectionHeaders); - if (NULL == RelocSectionHeader) - { - fprintf(stderr, "Can't find section header for relocation data\n"); - return 1; - } - - *ProcessedRelocs = malloc(RelocSectionHeader->SizeOfRawData); - if (NULL == *ProcessedRelocs) - { - fprintf(stderr, "Failed to allocate %u bytes for relocations\n", (unsigned int)RelocSectionHeader->SizeOfRawData); - return 1; - } - *ProcessedRelocsLength = 0; - - BaseReloc = (PIMAGE_BASE_RELOCATION) ((char *) RawData - + RelocSectionHeader->PointerToRawData - + (OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress - + PIMAGE_SECTION_HEADER RelocSectionHeader, TargetSectionHeader; + PIMAGE_BASE_RELOCATION BaseReloc, End, AcceptedRelocs; + int Found; + + if (OptHeader->NumberOfRvaAndSizes < IMAGE_DIRECTORY_ENTRY_BASERELOC || + OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress == 0) + { + /* No relocation entries */ + *ProcessedRelocsLength = 0; + *ProcessedRelocs = NULL; + return 0; + } + + RelocSectionHeader = FindSectionForRVA(OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress, + NumberOfSections, SectionHeaders); + if (RelocSectionHeader == NULL) + { + fprintf(stderr, "Can't find section header for relocation data\n"); + return 1; + } + + *ProcessedRelocs = malloc(RelocSectionHeader->SizeOfRawData); + if (*ProcessedRelocs == NULL) + { + fprintf(stderr, + "Failed to allocate %u bytes for relocations\n", + (unsigned int)RelocSectionHeader->SizeOfRawData); + return 1; + } + *ProcessedRelocsLength = 0; + + BaseReloc = (PIMAGE_BASE_RELOCATION) ((char *) RawData + + RelocSectionHeader->PointerToRawData + + (OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress - RelocSectionHeader->VirtualAddress)); - End = (PIMAGE_BASE_RELOCATION) ((char *) BaseReloc - + OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size); - - while (BaseReloc < End && 0 < BaseReloc->SizeOfBlock) - { - TargetSectionHeader = FindSectionForRVA(BaseReloc->VirtualAddress, NumberOfSections, - SectionHeaders); - if (NULL != TargetSectionHeader) - { - AcceptedRelocs = *ProcessedRelocs; - Found = 0; - while (AcceptedRelocs < (PIMAGE_BASE_RELOCATION) ((char *) *ProcessedRelocs + - *ProcessedRelocsLength) - && ! Found) - { - Found = BaseReloc->SizeOfBlock == AcceptedRelocs->SizeOfBlock - && 0 == memcmp(BaseReloc, AcceptedRelocs, AcceptedRelocs->SizeOfBlock); - AcceptedRelocs= (PIMAGE_BASE_RELOCATION) ((char *) AcceptedRelocs + - AcceptedRelocs->SizeOfBlock); - } - if (! Found) - { - memcpy((char *) *ProcessedRelocs + *ProcessedRelocsLength, - BaseReloc, BaseReloc->SizeOfBlock); - *ProcessedRelocsLength += BaseReloc->SizeOfBlock; - } - } - BaseReloc = (PIMAGE_BASE_RELOCATION)((char *) BaseReloc + BaseReloc->SizeOfBlock); - } - - return 0; + End = (PIMAGE_BASE_RELOCATION) ((char *) BaseReloc + + OptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size); + + while (BaseReloc < End && BaseReloc->SizeOfBlock > 0) + { + TargetSectionHeader = FindSectionForRVA(BaseReloc->VirtualAddress, + NumberOfSections, + SectionHeaders); + if (TargetSectionHeader != NULL) + { + AcceptedRelocs = *ProcessedRelocs; + Found = 0; + while (AcceptedRelocs < (PIMAGE_BASE_RELOCATION) ((char *) *ProcessedRelocs + + *ProcessedRelocsLength) + && !Found) + { + Found = BaseReloc->SizeOfBlock == AcceptedRelocs->SizeOfBlock && + memcmp(BaseReloc, AcceptedRelocs, AcceptedRelocs->SizeOfBlock) == 0; + AcceptedRelocs = (PIMAGE_BASE_RELOCATION) ((char *) AcceptedRelocs + + AcceptedRelocs->SizeOfBlock); + } + if (!Found) + { + memcpy((char *) *ProcessedRelocs + *ProcessedRelocsLength, + BaseReloc, + BaseReloc->SizeOfBlock); + *ProcessedRelocsLength += BaseReloc->SizeOfBlock; + } + } + BaseReloc = (PIMAGE_BASE_RELOCATION)((char *) BaseReloc + BaseReloc->SizeOfBlock); + } + + return 0; } static int @@ -508,449 +516,502 @@ PIMAGE_OPTIONAL_HEADER InOptHeader, PIMAGE_SECTION_HEADER InSectionHeaders, ULONG RosSymLength, void *RosSymSection) { - ULONG StartOfRawData; - unsigned Section; - void *OutHeader, *ProcessedRelocs, *PaddedRosSym, *Data; - PIMAGE_DOS_HEADER OutDosHeader; - PIMAGE_FILE_HEADER OutFileHeader; - PIMAGE_OPTIONAL_HEADER OutOptHeader; - PIMAGE_SECTION_HEADER OutSectionHeaders, CurrentSectionHeader; - DWORD CheckSum; - ULONG Length, i; - ULONG ProcessedRelocsLength; - ULONG RosSymOffset, RosSymFileLength; - int InRelocSectionIndex; - PIMAGE_SECTION_HEADER OutRelocSection; - - StartOfRawData = 0; - for (Section = 0; Section < InFileHeader->NumberOfSections; Section++) - { - if ((0 == StartOfRawData - || InSectionHeaders[Section].PointerToRawData < StartOfRawData) - && 0 != InSectionHeaders[Section].PointerToRawData - && 0 != (strncmp((char *) InSectionHeaders[Section].Name, ".stab", 5))) - { - StartOfRawData = InSectionHeaders[Section].PointerToRawData; - } - } - OutHeader = malloc(StartOfRawData); - if (NULL == OutHeader) - { - fprintf(stderr, "Failed to allocate %u bytes for output file header\n", (unsigned int)StartOfRawData); - return 1; - } - memset(OutHeader, '\0', StartOfRawData); - - OutDosHeader = (PIMAGE_DOS_HEADER) OutHeader; - memcpy(OutDosHeader, InDosHeader, InDosHeader->e_lfanew + sizeof(ULONG)); - - OutFileHeader = (PIMAGE_FILE_HEADER)((char *) OutHeader + OutDosHeader->e_lfanew + sizeof(ULONG)); - memcpy(OutFileHeader, InFileHeader, sizeof(IMAGE_FILE_HEADER)); - OutFileHeader->PointerToSymbolTable = 0; - OutFileHeader->NumberOfSymbols = 0; - OutFileHeader->Characteristics &= ~(IMAGE_FILE_LINE_NUMS_STRIPPED | IMAGE_FILE_LOCAL_SYMS_STRIPPED | - IMAGE_FILE_DEBUG_STRIPPED); - - OutOptHeader = (PIMAGE_OPTIONAL_HEADER)(OutFileHeader + 1); - memcpy(OutOptHeader, InOptHeader, sizeof(IMAGE_OPTIONAL_HEADER)); - OutOptHeader->CheckSum = 0; - - OutSectionHeaders = (PIMAGE_SECTION_HEADER)((char *) OutOptHeader + OutFileHeader->SizeOfOptionalHeader); - - if (ProcessRelocations(&ProcessedRelocsLength, &ProcessedRelocs, InData, InOptHeader, - InFileHeader->NumberOfSections, InSectionHeaders)) - { - return 1; - } - if (InOptHeader->NumberOfRvaAndSizes < IMAGE_DIRECTORY_ENTRY_BASERELOC - || 0 == InOptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress) - { - InRelocSectionIndex = -1; - } - else - { - InRelocSectionIndex = FindSectionForRVA(InOptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress, - InFileHeader->NumberOfSections, InSectionHeaders) - InSectionHeaders; - } - - OutFileHeader->NumberOfSections = 0; - CurrentSectionHeader = OutSectionHeaders; - OutOptHeader->SizeOfImage = 0; - RosSymOffset = 0; - OutRelocSection = NULL; - for (Section = 0; Section < InFileHeader->NumberOfSections; Section++) - { - if (0 != (strncmp((char *) InSectionHeaders[Section].Name, ".stab", 5))) - { - *CurrentSectionHeader = InSectionHeaders[Section]; - CurrentSectionHeader->PointerToLinenumbers = 0; - CurrentSectionHeader->NumberOfLinenumbers = 0; - if (OutOptHeader->SizeOfImage < CurrentSectionHeader->VirtualAddress + - CurrentSectionHeader->Misc.VirtualSize) - { - OutOptHeader->SizeOfImage = ROUND_UP(CurrentSectionHeader->VirtualAddress + - CurrentSectionHeader->Misc.VirtualSize, - OutOptHeader->SectionAlignment); - } - if (RosSymOffset < CurrentSectionHeader->PointerToRawData + CurrentSectionHeader->SizeOfRawData) - { - RosSymOffset = CurrentSectionHeader->PointerToRawData + CurrentSectionHeader->SizeOfRawData; - } - if (Section == (ULONG)InRelocSectionIndex) - { - OutRelocSection = CurrentSectionHeader; - } - (OutFileHeader->NumberOfSections) ++; - CurrentSectionHeader++; - } - } - - if (OutRelocSection == CurrentSectionHeader - 1) - { - OutOptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = ProcessedRelocsLength; - if (OutOptHeader->SizeOfImage == OutRelocSection->VirtualAddress + - ROUND_UP(OutRelocSection->Misc.VirtualSize, - OutOptHeader->SectionAlignment)) - { - OutOptHeader->SizeOfImage = OutRelocSection->VirtualAddress + - ROUND_UP(ProcessedRelocsLength, - OutOptHeader->SectionAlignment); - } - OutRelocSection->Misc.VirtualSize = ProcessedRelocsLength; - if (RosSymOffset == OutRelocSection->PointerToRawData - + OutRelocSection->SizeOfRawData) - { - RosSymOffset = OutRelocSection->PointerToRawData + - ROUND_UP(ProcessedRelocsLength, OutOptHeader->FileAlignment); - } - OutRelocSection->SizeOfRawData = ROUND_UP(ProcessedRelocsLength, - OutOptHeader->FileAlignment); - } - - if (RosSymLength > 0) - { - RosSymFileLength = ROUND_UP(RosSymLength, OutOptHeader->FileAlignment); - memcpy(CurrentSectionHeader->Name, ".rossym", 8); /* We're lucky: string is exactly 8 bytes long */ - CurrentSectionHeader->Misc.VirtualSize = RosSymLength; - CurrentSectionHeader->VirtualAddress = OutOptHeader->SizeOfImage; - CurrentSectionHeader->SizeOfRawData = RosSymFileLength; - CurrentSectionHeader->PointerToRawData = RosSymOffset; - CurrentSectionHeader->PointerToRelocations = 0; - CurrentSectionHeader->PointerToLinenumbers = 0; - CurrentSectionHeader->NumberOfRelocations = 0; - CurrentSectionHeader->NumberOfLinenumbers = 0; - CurrentSectionHeader->Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_DISCARDABLE - | IMAGE_SCN_LNK_REMOVE | IMAGE_SCN_TYPE_NOLOAD; - OutOptHeader->SizeOfImage = ROUND_UP(CurrentSectionHeader->VirtualAddress + - CurrentSectionHeader->Misc.VirtualSize, - OutOptHeader->SectionAlignment); - (OutFileHeader->NumberOfSections)++; - - PaddedRosSym = malloc(RosSymFileLength); - if (NULL == PaddedRosSym) - { - fprintf(stderr, "Failed to allocate %u bytes for padded .rossym\n", (unsigned int)RosSymFileLength); - return 1; - } - memcpy(PaddedRosSym, RosSymSection, RosSymLength); - memset((char *) PaddedRosSym + RosSymLength, '\0', RosSymFileLength - RosSymLength); - } - else - { - PaddedRosSym = NULL; - } - CheckSum = 0; - for (i = 0; i < StartOfRawData / 2; i++) - { - CheckSum += ((unsigned short*) OutHeader)[i]; - CheckSum = 0xffff & (CheckSum + (CheckSum >> 16)); - } - Length = StartOfRawData; - for (Section = 0; Section < OutFileHeader->NumberOfSections; Section++) - { - DWORD SizeOfRawData; - if (OutRelocSection == OutSectionHeaders + Section) - { - Data = (void *) ProcessedRelocs; - SizeOfRawData = ProcessedRelocsLength; - } - else if (RosSymLength > 0 && Section + 1 == OutFileHeader->NumberOfSections) - { - Data = (void *) PaddedRosSym; - SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; - } - else - { - Data = (void *) ((char *) InData + OutSectionHeaders[Section].PointerToRawData); - SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; - } - for (i = 0; i < SizeOfRawData / 2; i++) - { - CheckSum += ((unsigned short*) Data)[i]; - CheckSum = 0xffff & (CheckSum + (CheckSum >> 16)); - } - Length += OutSectionHeaders[Section].SizeOfRawData; - } - CheckSum += Length; - OutOptHeader->CheckSum = CheckSum; - - if (fwrite(OutHeader, 1, StartOfRawData, OutFile) != StartOfRawData) - { - perror("Error writing output header\n"); - free(OutHeader); - return 1; - } - - for (Section = 0; Section < OutFileHeader->NumberOfSections; Section++) - { - if (0 != OutSectionHeaders[Section].SizeOfRawData) - { - DWORD SizeOfRawData; - fseek(OutFile, OutSectionHeaders[Section].PointerToRawData, SEEK_SET); - if (OutRelocSection == OutSectionHeaders + Section) - { - Data = (void *) ProcessedRelocs; - SizeOfRawData = ProcessedRelocsLength; - } - else if (RosSymLength > 0 && Section + 1 == OutFileHeader->NumberOfSections) - { - Data = (void *) PaddedRosSym; - SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; - } - else - { - Data = (void *) ((char *) InData + OutSectionHeaders[Section].PointerToRawData); - SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; - } - if (fwrite(Data, 1, SizeOfRawData, OutFile) != SizeOfRawData) - { - perror("Error writing section data\n"); - free(PaddedRosSym); - free(OutHeader); - return 1; - } - } - } - - if (PaddedRosSym) - { - free(PaddedRosSym); - } - free(OutHeader); - - return 0; + ULONG StartOfRawData; + unsigned Section; + void *OutHeader, *ProcessedRelocs, *PaddedRosSym, *Data; + PIMAGE_DOS_HEADER OutDosHeader; + PIMAGE_FILE_HEADER OutFileHeader; + PIMAGE_OPTIONAL_HEADER OutOptHeader; + PIMAGE_SECTION_HEADER OutSectionHeaders, CurrentSectionHeader; + DWORD CheckSum; + ULONG Length, i; + ULONG ProcessedRelocsLength; + ULONG RosSymOffset, RosSymFileLength; + int InRelocSectionIndex; + PIMAGE_SECTION_HEADER OutRelocSection; + + StartOfRawData = 0; + for (Section = 0; Section < InFileHeader->NumberOfSections; Section++) + { + if ((StartOfRawData == 0 || + InSectionHeaders[Section].PointerToRawData < StartOfRawData) + && InSectionHeaders[Section].PointerToRawData != 0 + && (strncmp((char *) InSectionHeaders[Section].Name, ".stab", 5)) != 0) + { + StartOfRawData = InSectionHeaders[Section].PointerToRawData; + } + } + OutHeader = malloc(StartOfRawData); + if (OutHeader == NULL) + { + fprintf(stderr, + "Failed to allocate %u bytes for output file header\n", + (unsigned int)StartOfRawData); + return 1; + } + memset(OutHeader, '\0', StartOfRawData); + + OutDosHeader = (PIMAGE_DOS_HEADER) OutHeader; + memcpy(OutDosHeader, InDosHeader, InDosHeader->e_lfanew + sizeof(ULONG)); + + OutFileHeader = (PIMAGE_FILE_HEADER)((char *) OutHeader + OutDosHeader->e_lfanew + sizeof(ULONG)); + memcpy(OutFileHeader, InFileHeader, sizeof(IMAGE_FILE_HEADER)); + OutFileHeader->PointerToSymbolTable = 0; + OutFileHeader->NumberOfSymbols = 0; + OutFileHeader->Characteristics &= ~(IMAGE_FILE_LINE_NUMS_STRIPPED | IMAGE_FILE_LOCAL_SYMS_STRIPPED | + IMAGE_FILE_DEBUG_STRIPPED); + + OutOptHeader = (PIMAGE_OPTIONAL_HEADER)(OutFileHeader + 1); + memcpy(OutOptHeader, InOptHeader, sizeof(IMAGE_OPTIONAL_HEADER)); + OutOptHeader->CheckSum = 0; + + OutSectionHeaders = (PIMAGE_SECTION_HEADER)((char *) OutOptHeader + OutFileHeader->SizeOfOptionalHeader); + + if (ProcessRelocations(&ProcessedRelocsLength, + &ProcessedRelocs, + InData, + InOptHeader, + InFileHeader->NumberOfSections, + InSectionHeaders)) + { + return 1; + } + if (InOptHeader->NumberOfRvaAndSizes < IMAGE_DIRECTORY_ENTRY_BASERELOC || + InOptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress == 0) + { + InRelocSectionIndex = -1; + } + else + { + InRelocSectionIndex = FindSectionForRVA(InOptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress, + InFileHeader->NumberOfSections, InSectionHeaders) - InSectionHeaders; + } + + OutFileHeader->NumberOfSections = 0; + CurrentSectionHeader = OutSectionHeaders; + OutOptHeader->SizeOfImage = 0; + RosSymOffset = 0; + OutRelocSection = NULL; + for (Section = 0; Section < InFileHeader->NumberOfSections; Section++) + { + if ((strncmp((char *) InSectionHeaders[Section].Name, ".stab", 5)) != 0) + { + *CurrentSectionHeader = InSectionHeaders[Section]; + CurrentSectionHeader->PointerToLinenumbers = 0; + CurrentSectionHeader->NumberOfLinenumbers = 0; + if (OutOptHeader->SizeOfImage < CurrentSectionHeader->VirtualAddress + + CurrentSectionHeader->Misc.VirtualSize) + { + OutOptHeader->SizeOfImage = ROUND_UP(CurrentSectionHeader->VirtualAddress + + CurrentSectionHeader->Misc.VirtualSize, + OutOptHeader->SectionAlignment); + } + if (RosSymOffset < CurrentSectionHeader->PointerToRawData + CurrentSectionHeader->SizeOfRawData) + { + RosSymOffset = CurrentSectionHeader->PointerToRawData + CurrentSectionHeader->SizeOfRawData; + } + if (Section == (ULONG)InRelocSectionIndex) + { + OutRelocSection = CurrentSectionHeader; + } + (OutFileHeader->NumberOfSections)++; + CurrentSectionHeader++; + } + } + + if (OutRelocSection == CurrentSectionHeader - 1) + { + OutOptHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = ProcessedRelocsLength; + if (OutOptHeader->SizeOfImage == OutRelocSection->VirtualAddress + + ROUND_UP(OutRelocSection->Misc.VirtualSize, + OutOptHeader->SectionAlignment)) + { + OutOptHeader->SizeOfImage = OutRelocSection->VirtualAddress + + ROUND_UP(ProcessedRelocsLength, + OutOptHeader->SectionAlignment); + } + OutRelocSection->Misc.VirtualSize = ProcessedRelocsLength; + if (RosSymOffset == OutRelocSection->PointerToRawData + + OutRelocSection->SizeOfRawData) + { + RosSymOffset = OutRelocSection->PointerToRawData + + ROUND_UP(ProcessedRelocsLength, + OutOptHeader->FileAlignment); + } + OutRelocSection->SizeOfRawData = ROUND_UP(ProcessedRelocsLength, + OutOptHeader->FileAlignment); + } + + if (RosSymLength > 0) + { + RosSymFileLength = ROUND_UP(RosSymLength, OutOptHeader->FileAlignment); + memcpy(CurrentSectionHeader->Name, ".rossym", 8); /* We're lucky: string is exactly 8 bytes long */ + CurrentSectionHeader->Misc.VirtualSize = RosSymLength; + CurrentSectionHeader->VirtualAddress = OutOptHeader->SizeOfImage; + CurrentSectionHeader->SizeOfRawData = RosSymFileLength; + CurrentSectionHeader->PointerToRawData = RosSymOffset; + CurrentSectionHeader->PointerToRelocations = 0; + CurrentSectionHeader->PointerToLinenumbers = 0; + CurrentSectionHeader->NumberOfRelocations = 0; + CurrentSectionHeader->NumberOfLinenumbers = 0; + CurrentSectionHeader->Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_DISCARDABLE + | IMAGE_SCN_LNK_REMOVE | IMAGE_SCN_TYPE_NOLOAD; + OutOptHeader->SizeOfImage = ROUND_UP(CurrentSectionHeader->VirtualAddress + CurrentSectionHeader->Misc.VirtualSize, + OutOptHeader->SectionAlignment); + (OutFileHeader->NumberOfSections)++; + + PaddedRosSym = malloc(RosSymFileLength); + if (PaddedRosSym == NULL) + { + fprintf(stderr, + "Failed to allocate %u bytes for padded .rossym\n", + (unsigned int)RosSymFileLength); + return 1; + } + memcpy(PaddedRosSym, RosSymSection, RosSymLength); + memset((char *) PaddedRosSym + RosSymLength, + '\0', + RosSymFileLength - RosSymLength); + } + else + { + PaddedRosSym = NULL; + } + CheckSum = 0; + for (i = 0; i < StartOfRawData / 2; i++) + { + CheckSum += ((unsigned short*) OutHeader)[i]; + CheckSum = 0xffff & (CheckSum + (CheckSum >> 16)); + } + Length = StartOfRawData; + for (Section = 0; Section < OutFileHeader->NumberOfSections; Section++) + { + DWORD SizeOfRawData; + if (OutRelocSection == OutSectionHeaders + Section) + { + Data = (void *) ProcessedRelocs; + SizeOfRawData = ProcessedRelocsLength; + } + else if (RosSymLength > 0 && Section + 1 == OutFileHeader->NumberOfSections) + { + Data = (void *) PaddedRosSym; + SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; + } + else + { + Data = (void *) ((char *) InData + OutSectionHeaders[Section].PointerToRawData); + SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; + } + for (i = 0; i < SizeOfRawData / 2; i++) + { + CheckSum += ((unsigned short*) Data)[i]; + CheckSum = 0xffff & (CheckSum + (CheckSum >> 16)); + } + Length += OutSectionHeaders[Section].SizeOfRawData; + } + CheckSum += Length; + OutOptHeader->CheckSum = CheckSum; + + if (fwrite(OutHeader, 1, StartOfRawData, OutFile) != StartOfRawData) + { + perror("Error writing output header\n"); + free(OutHeader); + return 1; + } + + for (Section = 0; Section < OutFileHeader->NumberOfSections; Section++) + { + if (OutSectionHeaders[Section].SizeOfRawData != 0) + { + DWORD SizeOfRawData; + fseek(OutFile, OutSectionHeaders[Section].PointerToRawData, SEEK_SET); + if (OutRelocSection == OutSectionHeaders + Section) + { + Data = (void *) ProcessedRelocs; + SizeOfRawData = ProcessedRelocsLength; + } + else if (RosSymLength > 0 && Section + 1 == OutFileHeader->NumberOfSections) + { + Data = (void *) PaddedRosSym; + SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; + } + else + { + Data = (void *) ((char *) InData + OutSectionHeaders[Section].PointerToRawData); + SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; + } + if (fwrite(Data, 1, SizeOfRawData, OutFile) != SizeOfRawData) + { + perror("Error writing section data\n"); + free(PaddedRosSym); + free(OutHeader); + return 1; + } + } + } + + if (PaddedRosSym) + { + free(PaddedRosSym); + } + free(OutHeader); + + return 0; } int main(int argc, char* argv[]) { - PSYMBOLFILE_HEADER SymbolFileHeader; - PIMAGE_DOS_HEADER PEDosHeader; - PIMAGE_FILE_HEADER PEFileHeader; - PIMAGE_OPTIONAL_HEADER PEOptHeader; - PIMAGE_SECTION_HEADER PESectionHeaders; - ULONG ImageBase; - void *StabBase; - ULONG StabsLength; - void *StabStringBase; - ULONG StabStringsLength; - void *CoffBase = NULL; - ULONG CoffsLength; - void *CoffStringBase = NULL; - ULONG CoffStringsLength; - char* path1; - char* path2; - FILE* out; - void *StringBase; - ULONG StringsLength; - ULONG StabSymbolsCount; - PROSSYM_ENTRY StabSymbols; - ULONG CoffSymbolsCount; - PROSSYM_ENTRY CoffSymbols; - ULONG MergedSymbolsCount; - PROSSYM_ENTRY MergedSymbols; - size_t FileSize; - void *FileData; - ULONG RosSymLength; - void *RosSymSection; - char elfhdr[4] = { '\177', 'E', 'L', 'F' }; - - if (3 != argc) - { - fprintf(stderr, "Usage: rsym <exefile> <symfile>\n"); - exit(1); - } - - path1 = convert_path(argv[1]); - path2 = convert_path(argv[2]); - - FileData = load_file ( path1, &FileSize ); - if ( !FileData ) - { - fprintf ( stderr, "An error occured loading '%s'\n", path1 ); - exit(1); - } - - /* Check if MZ header exists */ - PEDosHeader = (PIMAGE_DOS_HEADER) FileData; - if (PEDosHeader->e_magic != IMAGE_DOS_MAGIC || PEDosHeader->e_lfanew == 0L) - { - /* Ignore elf */ - if (!memcmp(PEDosHeader, elfhdr, sizeof(elfhdr))) - exit(0); - perror("Input file is not a PE image.\n"); - free(FileData); - exit(1); - } - - /* Locate PE file header */ - /* sizeof(ULONG) = sizeof(MAGIC) */ - PEFileHeader = (PIMAGE_FILE_HEADER)((char *) FileData + PEDosHeader->e_lfanew + sizeof(ULONG)); - - /* Locate optional header */ - assert(sizeof(ULONG) == 4); - PEOptHeader = (PIMAGE_OPTIONAL_HEADER)(PEFileHeader + 1); - ImageBase = PEOptHeader->ImageBase; - - /* Locate PE section headers */ - PESectionHeaders = (PIMAGE_SECTION_HEADER)((char *) PEOptHeader + PEFileHeader->SizeOfOptionalHeader); - - if (GetStabInfo(FileData, PEFileHeader, PESectionHeaders, &StabsLength, &StabBase, - &StabStringsLength, &StabStringBase)) - { - free(FileData); - exit(1); - } - - if (GetCoffInfo(FileData, PEFileHeader, PESectionHeaders, &CoffsLength, &CoffBase, - &CoffStringsLength, &CoffStringBase)) - { - free(FileData); - exit(1); - } - - StringBase = malloc(1 + StabStringsLength + CoffStringsLength + - (CoffsLength / sizeof(ROSSYM_ENTRY)) * (E_SYMNMLEN + 1)); - if (NULL == StringBase) - { - free(FileData); - fprintf(stderr, "Failed to allocate memory for strings table\n"); - exit(1); - } - /* Make offset 0 into an empty string */ - *((char *) StringBase) = '\0'; - StringsLength = 1; - - if (ConvertStabs(&StabSymbolsCount, &StabSymbols, &StringsLength, StringBase, - StabsLength, StabBase, StabStringsLength, StabStringBase, - ImageBase, PEFileHeader, PESectionHeaders)) - { - free(StringBase); - free(FileData); - fprintf(stderr, "Failed to allocate memory for strings table\n"); - exit(1); - } - - if (ConvertCoffs(&CoffSymbolsCount, &CoffSymbols, &StringsLength, StringBase, - CoffsLength, CoffBase, CoffStringsLength, CoffStringBase, - ImageBase, PEFileHeader, PESectionHeaders)) - { - if (StabSymbols) - { - free(StabSymbols); - } - free(StringBase); - free(FileData); - exit(1); - } - - if (MergeStabsAndCoffs(&MergedSymbolsCount, &MergedSymbols, - StabSymbolsCount, StabSymbols, - CoffSymbolsCount, CoffSymbols)) - { - if (CoffSymbols) - { - free(CoffSymbols); - } - if (StabSymbols) - { - free(StabSymbols); - } - free(StringBase); - free(FileData); - exit(1); - } - - if (CoffSymbols) - { - free(CoffSymbols); - } - if (StabSymbols) - { - free(StabSymbols); - } - if (MergedSymbolsCount == 0) - { - RosSymLength = 0; - RosSymSection = NULL; - } - else - { - RosSymLength = sizeof(SYMBOLFILE_HEADER) + MergedSymbolsCount * sizeof(ROSSYM_ENTRY) - + StringsLength; - RosSymSection = malloc(RosSymLength); - if (NULL == RosSymSection) - { - free(MergedSymbols); - free(StringBase); - free(FileData); - fprintf(stderr, "Unable to allocate memory for .rossym section\n"); - exit(1); - } - memset(RosSymSection, '\0', RosSymLength); - - SymbolFileHeader = (PSYMBOLFILE_HEADER) RosSymSection; - SymbolFileHeader->SymbolsOffset = sizeof(SYMBOLFILE_HEADER); - SymbolFileHeader->SymbolsLength = MergedSymbolsCount * sizeof(ROSSYM_ENTRY); - SymbolFileHeader->StringsOffset = SymbolFileHeader->SymbolsOffset + SymbolFileHeader->SymbolsLength; - SymbolFileHeader->StringsLength = StringsLength; - - memcpy((char *) RosSymSection + SymbolFileHeader->SymbolsOffset, MergedSymbols, - SymbolFileHeader->SymbolsLength); - memcpy((char *) RosSymSection + SymbolFileHeader->StringsOffset, StringBase, - SymbolFileHeader->StringsLength); - - free(MergedSymbols); - } - free(StringBase); - out = fopen(path2, "wb"); - if (out == NULL) - { - perror("Cannot open output file"); - free(RosSymSection); - free(FileData); - exit(1); - } - - if (CreateOutputFile(out, FileData, PEDosHeader, PEFileHeader, PEOptHeader, - PESectionHeaders, RosSymLength, RosSymSection)) - { - fclose(out); - if (RosSymSection) - { - free(RosSymSection); - } - free(FileData); - exit(1); - } - - fclose(out); - if (RosSymSection) - { - free(RosSymSection); - } - free(FileData); - - return 0; + PSYMBOLFILE_HEADER SymbolFileHeader; + PIMAGE_DOS_HEADER PEDosHeader; + PIMAGE_FILE_HEADER PEFileHeader; + PIMAGE_OPTIONAL_HEADER PEOptHeader; + PIMAGE_SECTION_HEADER PESectionHeaders; + ULONG ImageBase; + void *StabBase; + ULONG StabsLength; + void *StabStringBase; + ULONG StabStringsLength; + void *CoffBase = NULL; + ULONG CoffsLength; + void *CoffStringBase = NULL; + ULONG CoffStringsLength; + char* path1; + char* path2; + FILE* out; + void *StringBase; + ULONG StringsLength; + ULONG StabSymbolsCount; + PROSSYM_ENTRY StabSymbols; + ULONG CoffSymbolsCount; + PROSSYM_ENTRY CoffSymbols; + ULONG MergedSymbolsCount; + PROSSYM_ENTRY MergedSymbols; + size_t FileSize; + void *FileData; + ULONG RosSymLength; + void *RosSymSection; + char elfhdr[4] = { '\177', 'E', 'L', 'F' }; + + if (argc != 3) + { + fprintf(stderr, "Usage: rsym <exefile> <symfile>\n"); + exit(1); + } + + path1 = convert_path(argv[1]); + path2 = convert_path(argv[2]); + + FileData = load_file(path1, &FileSize); + if (!FileData) + { + fprintf(stderr, "An error occured loading '%s'\n", path1); + exit(1); + } + + /* Check if MZ header exists */ + PEDosHeader = (PIMAGE_DOS_HEADER) FileData; + if (PEDosHeader->e_magic != IMAGE_DOS_MAGIC || + PEDosHeader->e_lfanew == 0L) + { + /* Ignore elf */ + if (!memcmp(PEDosHeader, elfhdr, sizeof(elfhdr))) + exit(0); + perror("Input file is not a PE image.\n"); + free(FileData); + exit(1); + } + + /* Locate PE file header */ + /* sizeof(ULONG) = sizeof(MAGIC) */ + PEFileHeader = (PIMAGE_FILE_HEADER)((char *) FileData + PEDosHeader->e_lfanew + sizeof(ULONG)); + + /* Locate optional header */ + assert(sizeof(ULONG) == 4); + PEOptHeader = (PIMAGE_OPTIONAL_HEADER)(PEFileHeader + 1); + ImageBase = PEOptHeader->ImageBase; + + /* Locate PE section headers */ + PESectionHeaders = (PIMAGE_SECTION_HEADER)((char *) PEOptHeader + PEFileHeader->SizeOfOptionalHeader); + + if (GetStabInfo(FileData, + PEFileHeader, + PESectionHeaders, + &StabsLength, + &StabBase, + &StabStringsLength, + &StabStringBase)) + { + free(FileData); + exit(1); + } + + if (GetCoffInfo(FileData, + PEFileHeader, + PESectionHeaders, + &CoffsLength, + &CoffBase, + &CoffStringsLength, + &CoffStringBase)) + { + free(FileData); + exit(1); + } + + StringBase = malloc(1 + StabStringsLength + CoffStringsLength + + (CoffsLength / sizeof(ROSSYM_ENTRY)) * (E_SYMNMLEN + 1)); + if (StringBase == NULL) + { + free(FileData); + fprintf(stderr, "Failed to allocate memory for strings table\n"); + exit(1); + } + /* Make offset 0 into an empty string */ + *((char *) StringBase) = '\0'; + StringsLength = 1; + + if (ConvertStabs(&StabSymbolsCount, + &StabSymbols, + &StringsLength, + StringBase, + StabsLength, + StabBase, + StabStringsLength, + StabStringBase, + ImageBase, + PEFileHeader, + PESectionHeaders)) + { + free(StringBase); + free(FileData); + fprintf(stderr, "Failed to allocate memory for strings table\n"); + exit(1); + } + + if (ConvertCoffs(&CoffSymbolsCount, + &CoffSymbols, + &StringsLength, + StringBase, + CoffsLength, + CoffBase, + CoffStringsLength, + CoffStringBase, + ImageBase, + PEFileHeader, + PESectionHeaders)) + { + if (StabSymbols) + { + free(StabSymbols); + } + free(StringBase); + free(FileData); + exit(1); + } + + if (MergeStabsAndCoffs(&MergedSymbolsCount, + &MergedSymbols, + StabSymbolsCount, + StabSymbols, + CoffSymbolsCount, + CoffSymbols)) + { + if (CoffSymbols) + { + free(CoffSymbols); + } + if (StabSymbols) + { + free(StabSymbols); + } + free(StringBase); + free(FileData); + exit(1); + } + + if (CoffSymbols) + { + free(CoffSymbols); + } + if (StabSymbols) + { + free(StabSymbols); + } + if (MergedSymbolsCount == 0) + { + RosSymLength = 0; + RosSymSection = NULL; + } + else + { + RosSymLength = sizeof(SYMBOLFILE_HEADER) + + MergedSymbolsCount * sizeof(ROSSYM_ENTRY) + + StringsLength; + + RosSymSection = malloc(RosSymLength); + if (RosSymSection == NULL) + { + free(MergedSymbols); + free(StringBase); + free(FileData); + fprintf(stderr, "Unable to allocate memory for .rossym section\n"); + exit(1); + } + memset(RosSymSection, '\0', RosSymLength); + + SymbolFileHeader = (PSYMBOLFILE_HEADER)RosSymSection; + SymbolFileHeader->SymbolsOffset = sizeof(SYMBOLFILE_HEADER); + SymbolFileHeader->SymbolsLength = MergedSymbolsCount * sizeof(ROSSYM_ENTRY); + SymbolFileHeader->StringsOffset = SymbolFileHeader->SymbolsOffset + + SymbolFileHeader->SymbolsLength; + SymbolFileHeader->StringsLength = StringsLength; + + memcpy((char *) RosSymSection + SymbolFileHeader->SymbolsOffset, + MergedSymbols, + SymbolFileHeader->SymbolsLength); + + memcpy((char *) RosSymSection + SymbolFileHeader->StringsOffset, + StringBase, + SymbolFileHeader->StringsLength); + + free(MergedSymbols); + } + + free(StringBase); + out = fopen(path2, "wb"); + if (out == NULL) + { + perror("Cannot open output file"); + free(RosSymSection); + free(FileData); + exit(1); + } + + if (CreateOutputFile(out, + FileData, + PEDosHeader, + PEFileHeader, + PEOptHeader, + PESectionHeaders, + RosSymLength, + RosSymSection)) + { + fclose(out); + if (RosSymSection) + { + free(RosSymSection); + } + free(FileData); + exit(1); + } + + fclose(out); + if (RosSymSection) + { + free(RosSymSection); + } + free(FileData); + + return 0; } /* EOF */

1 0

[fireball] 59495: [NTOS] - Fix CcMdlReadComplete2 prototype. - Fix a bug in Dominique Cote's code: when performing FsRtlGetFileSize, the length of the buffer should be set accordingly to the inform...
by fireball＠svn.reactos.org 16 Jul '13

16 Jul '13

Author: fireball Date: Tue Jul 16 22:37:01 2013 New Revision: 59495 URL: http://svn.reactos.org/svn/reactos?rev=59495&view=rev Log: [NTOS] - Fix CcMdlReadComplete2 prototype. - Fix a bug in Dominique Cote's code: when performing FsRtlGetFileSize, the length of the buffer should be set accordingly to the information class asked for, that is - FILE_STANDARD_INFORMATION structure. Previous calculation formula makes no sense at all and leads to memory corruption (if filesystem driver is stupid enough) or inability to get file size (if filesystem driver is coded by good developers). Modified: trunk/reactos/ntoskrnl/cache/mdlsup.c trunk/reactos/ntoskrnl/cache/newcc.h trunk/reactos/ntoskrnl/cc/mdl.c trunk/reactos/ntoskrnl/fsrtl/fastio.c trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/cache/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/mdlsup.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/cache/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/mdlsup.c [iso-8859-1] Tue Jul 16 22:37:01 2013 @@ -80,8 +80,8 @@ VOID NTAPI -CcMdlReadComplete2(IN PMDL MdlChain, - IN PFILE_OBJECT FileObject) +CcMdlReadComplete2(IN PFILE_OBJECT FileObject, + IN PMDL MdlChain) { UNIMPLEMENTED } Modified: trunk/reactos/ntoskrnl/cache/newcc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/newcc.h?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cache/newcc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/newcc.h [iso-8859-1] Tue Jul 16 22:37:01 2013 @@ -44,8 +44,8 @@ VOID NTAPI -CcMdlReadComplete2(IN PMDL MemoryDescriptorList, - IN PFILE_OBJECT FileObject); +CcMdlReadComplete2(IN PFILE_OBJECT FileObject, + IN PMDL MemoryDescriptorList); VOID NTAPI Modified: trunk/reactos/ntoskrnl/cc/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/mdl.c?rev=5949… ============================================================================== --- trunk/reactos/ntoskrnl/cc/mdl.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/mdl.c [iso-8859-1] Tue Jul 16 22:37:01 2013 @@ -51,8 +51,9 @@ VOID NTAPI CcMdlReadComplete2 ( - IN PMDL MemoryDescriptorList, - IN PFILE_OBJECT FileObject) + IN PFILE_OBJECT FileObject, + IN PMDL MemoryDescriptorList +) { PMDL Mdl; @@ -104,7 +105,7 @@ } /* Use slow path */ - CcMdlReadComplete2(MdlChain, FileObject); + CcMdlReadComplete2(FileObject, MdlChain); } /* Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fastio.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] Tue Jul 16 22:37:01 2013 @@ -880,7 +880,7 @@ IoStackLocation->FileObject = FileObject; IoStackLocation->DeviceObject = DeviceObject; IoStackLocation->Parameters.QueryFile.Length = - ALIGN_UP(sizeof(FILE_INFORMATION_CLASS), ULONG); + sizeof(FILE_STANDARD_INFORMATION); IoStackLocation->Parameters.QueryFile.FileInformationClass = FileStandardInformation; @@ -1019,7 +1019,7 @@ IN PDEVICE_OBJECT DeviceObject) { /* Call the Cache Manager */ - CcMdlReadComplete2(MemoryDescriptorList, FileObject); + CcMdlReadComplete2(FileObject, MemoryDescriptorList); return TRUE; } Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Tue Jul 16 22:37:01 2013 @@ -172,8 +172,8 @@ VOID NTAPI CcMdlReadComplete2( - IN PMDL MemoryDescriptorList, - IN PFILE_OBJECT FileObject + IN PFILE_OBJECT FileObject, + IN PMDL MemoryDescriptorList ); VOID

1 0

[fireball] 59494: [DDK] - Fix ExAllocateFromZone. I understand it's deprecated, but it having a broken implementation which can't work at all because the one who coded this function failed to under...
by fireball＠svn.reactos.org 16 Jul '13

16 Jul '13

Author: fireball Date: Tue Jul 16 19:57:12 2013 New Revision: 59494 URL: http://svn.reactos.org/svn/reactos?rev=59494&view=rev Log: [DDK] - Fix ExAllocateFromZone. I understand it's deprecated, but it having a broken implementation which can't work at all because the one who coded this function failed to understand basic algorithms of linked lists is nonsense. Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/xdk/exfuncs.h Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=59… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Tue Jul 16 19:57:12 2013 @@ -3350,9 +3350,10 @@ ExAllocateFromZone( IN PZONE_HEADER Zone) { + PVOID Result = (PVOID)Zone->FreeList.Next; if (Zone->FreeList.Next) Zone->FreeList.Next = Zone->FreeList.Next->Next; - return (PVOID) Zone->FreeList.Next; + return Result; } static __inline PVOID Modified: trunk/reactos/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] Tue Jul 16 19:57:12 2013 @@ -276,9 +276,10 @@ ExAllocateFromZone( IN PZONE_HEADER Zone) { + PVOID Result = (PVOID)Zone->FreeList.Next; if (Zone->FreeList.Next) Zone->FreeList.Next = Zone->FreeList.Next->Next; - return (PVOID) Zone->FreeList.Next; + return Result; } static __inline PVOID

1 0

[fireball] 59493: [NTOS/EX] - ExInitializeZone: Don't add to an uninitialized TotalSegmentSize value, set it instead.
by fireball＠svn.reactos.org 16 Jul '13

16 Jul '13

Author: fireball Date: Tue Jul 16 19:21:55 2013 New Revision: 59493 URL: http://svn.reactos.org/svn/reactos?rev=59493&view=rev Log: [NTOS/EX] - ExInitializeZone: Don't add to an uninitialized TotalSegmentSize value, set it instead. Modified: trunk/reactos/ntoskrnl/ex/zone.c Modified: trunk/reactos/ntoskrnl/ex/zone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/zone.c?rev=594… ============================================================================== --- trunk/reactos/ntoskrnl/ex/zone.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/zone.c [iso-8859-1] Tue Jul 16 19:21:55 2013 @@ -147,8 +147,8 @@ Entry += Zone->BlockSize; } - /* Update Segment Size */ - Zone->TotalSegmentSize += i; + /* Set Segment Size */ + Zone->TotalSegmentSize = i; /* Return success */ return STATUS_SUCCESS;

1 0

[fireball] 59492: Dedicated to Timo.
by fireball＠svn.reactos.org 16 Jul '13

16 Jul '13

Author: fireball Date: Tue Jul 16 17:44:19 2013 New Revision: 59492 URL: http://svn.reactos.org/svn/reactos?rev=59492&view=rev Log: Dedicated to Timo. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Tue Jul 16 17:44:19 2013 @@ -112,7 +112,7 @@ and eax, NOT CR0_PG mov cr0, eax - /* Jump to the next instruction */ + /* Jump to the next instruction to clear the prefetch queue */ jmp $+2 /* Enable Page Size Extension in CR4 */

1 0

[fireball] 59491: [NTOS] - Implement enabling Large Pages support if it is detected. The Page Size Extension (PSE) bit in CR4 is enabled when paging is disabled. To achieve that, a temporary virtua...
by fireball＠svn.reactos.org 16 Jul '13

16 Jul '13

Author: fireball Date: Tue Jul 16 13:49:03 2013 New Revision: 59491 URL: http://svn.reactos.org/svn/reactos?rev=59491&view=rev Log: [NTOS] - Implement enabling Large Pages support if it is detected. The Page Size Extension (PSE) bit in CR4 is enabled when paging is disabled. To achieve that, a temporary virtual and physical identity mapping is created, which is discarded after PSE is enabled. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/patpge.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Tue Jul 16 13:49:03 2013 @@ -163,6 +163,18 @@ KV86_FRAME V86Frame; } KV8086_STACK_FRAME, *PKV8086_STACK_FRAME; +// +// Large Pages Support +// +typedef struct _LARGE_IDENTITY_MAP +{ + PHARDWARE_PTE TopLevelDirectory; + ULONG Cr3; + ULONG_PTR StartAddress; + ULONG PagesCount; + PVOID PagesList[30]; +} LARGE_IDENTITY_MAP, *PLARGE_IDENTITY_MAP; + /* Diable interrupts and return whether they were enabled before */ FORCEINLINE BOOLEAN @@ -372,6 +384,33 @@ NTAPI Ki386EnableGlobalPage( IN volatile ULONG_PTR Context +); + +ULONG_PTR +NTAPI +Ki386EnableTargetLargePage( + IN volatile ULONG_PTR Context +); + +BOOLEAN +NTAPI +Ki386CreateIdentityMap( + IN PLARGE_IDENTITY_MAP IdentityMap, + IN PVOID StartPtr, + IN ULONG Length +); + +VOID +NTAPI +Ki386FreeIdentityMap( + IN PLARGE_IDENTITY_MAP IdentityMap +); + +VOID +NTAPI +Ki386EnableCurrentLargePage( + IN ULONG_PTR StartAddress, + IN ULONG Cr3 ); VOID Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Tue Jul 16 13:49:03 2013 @@ -81,6 +81,61 @@ pop esp ret +PUBLIC _Ki386EnableCurrentLargePage@8 +_Ki386EnableCurrentLargePage@8: + /* Save StartAddress in eax */ + mov eax, [esp + 4] + + /* Save new CR3 value in ecx */ + mov ecx, [esp + 8] + + /* Save flags value */ + pushfd + + /* Disable interrupts */ + cli + + /* Compute linear address */ + sub eax, offset _Ki386EnableCurrentLargePage@8 + add eax, offset _Ki386LargePageIdentityLabel + + /* Save old CR3 in edx and replace with a new one */ + mov edx, cr3 + mov cr3, ecx + + /* Jump to the next instruction but in linear mapping */ + jmp eax + +_Ki386LargePageIdentityLabel: + /* Disable paging */ + mov eax, cr0 + and eax, NOT CR0_PG + mov cr0, eax + + /* Jump to the next instruction */ + jmp $+2 + + /* Enable Page Size Extension in CR4 */ + mov ecx, cr4 + or ecx, CR4_PSE + mov cr4, ecx + + /* Done, now re-enable paging */ + or eax, CR0_PG + mov cr0, eax + + /* Jump to virtual address */ + mov eax, offset VirtualSpace + jmp eax + +VirtualSpace: + /* Restore CR3 contents */ + mov cr3, edx + + /* Restore flags */ + popfd + + ret 8 /* FIXFIX: Move to C code ****/ PUBLIC _Ki386SetupAndExitToV86Mode@4 Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Tue Jul 16 13:49:03 2013 @@ -46,12 +46,17 @@ ULONG Dummy; KI_SAMPLE_MAP Samples[4]; PKI_SAMPLE_MAP CurrentSample = Samples; + LARGE_IDENTITY_MAP IdentityMap; /* Check for large page support */ if (KeFeatureBits & KF_LARGE_PAGE) { - /* FIXME: Support this */ - DPRINT("Large Page support detected but not yet taken advantage of\n"); + /* Do an IPI to enable it on all CPUs */ + if (Ki386CreateIdentityMap(&IdentityMap, Ki386EnableCurrentLargePage, 2)) + KeIpiGenericCall(Ki386EnableTargetLargePage, (ULONG_PTR)&IdentityMap); + + /* Free the pages allocated for identity map */ + Ki386FreeIdentityMap(&IdentityMap); } /* Check for global page support */ Modified: trunk/reactos/ntoskrnl/ke/i386/patpge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/patpge.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] Tue Jul 16 13:49:03 2013 @@ -12,6 +12,9 @@ #define NDEBUG #include <debug.h> +#define PDE_BITS 10 +#define PTE_BITS 10 + /* FUNCTIONS *****************************************************************/ ULONG_PTR @@ -59,3 +62,194 @@ /* FIXME: Support this */ DPRINT("PAT support detected but not yet taken advantage of\n"); } + +ULONG_PTR +NTAPI +INIT_FUNCTION +Ki386EnableTargetLargePage(IN ULONG_PTR Context) +{ + PLARGE_IDENTITY_MAP IdentityMap = (PLARGE_IDENTITY_MAP)Context; + + /* Call helper function with the start address and temporary page table pointer */ + Ki386EnableCurrentLargePage(IdentityMap->StartAddress, IdentityMap->Cr3); + + return 0; +} + +PVOID +NTAPI +Ki386AllocateContiguousMemory(PLARGE_IDENTITY_MAP IdentityMap, + ULONG PagesCount, + BOOLEAN InLower4Gb) +{ + PHYSICAL_ADDRESS AddressMask; + PVOID Result; + ULONG SizeInBytes = PagesCount * PAGE_SIZE; + + /* Initialize acceptable address mask to any possible address */ + AddressMask.LowPart = 0xFFFFFFFF; + AddressMask.HighPart = 0xFFFFFFFF; + + /* Mark out higher 4Gb if caller asked so */ + if (InLower4Gb) AddressMask.HighPart = 0; + + /* Try to allocate the memory */ + Result = MmAllocateContiguousMemory(SizeInBytes, AddressMask); + if (!Result) return NULL; + + /* Zero it out */ + RtlZeroMemory(Result, SizeInBytes); + + /* Track allocated pages in the IdentityMap structure */ + IdentityMap->PagesList[IdentityMap->PagesCount] = Result; + IdentityMap->PagesCount++; + + return Result; +} + +PHYSICAL_ADDRESS +NTAPI +Ki386BuildIdentityBuffer(PLARGE_IDENTITY_MAP IdentityMap, + PVOID StartPtr, + ULONG Length) +{ + // TODO: Check whether all pages are below 4GB boundary + return MmGetPhysicalAddress(StartPtr); +} + +BOOLEAN +NTAPI +Ki386IdentityMapMakeValid(PLARGE_IDENTITY_MAP IdentityMap, + PHARDWARE_PTE Pde, + PHARDWARE_PTE *PageTable) +{ + ULONG NewPage; + + if (Pde->Valid == 0) + { + /* Invalid, so allocate a new page for it */ + NewPage = (ULONG)Ki386AllocateContiguousMemory(IdentityMap, 1, FALSE); + if (!NewPage) return FALSE; + + /* Set PFN to its virtual address and mark it as valid */ + Pde->PageFrameNumber = NewPage >> PAGE_SHIFT; + Pde->Valid = 1; + + /* Pass page table address to the caller */ + if (PageTable) *PageTable = (PHARDWARE_PTE)NewPage; + } + else + { + /* Valid entry, just pass the page table address to the caller */ + if (PageTable) + *PageTable = (PHARDWARE_PTE)(Pde->PageFrameNumber << PAGE_SHIFT); + } + + return TRUE; +} + +BOOLEAN +NTAPI +Ki386MapAddress(PLARGE_IDENTITY_MAP IdentityMap, + ULONG_PTR VirtualPtr, + PHYSICAL_ADDRESS PhysicalPtr) +{ + PHARDWARE_PTE Pde, Pte; + PHARDWARE_PTE PageTable; + + /* Allocate page directory on demand */ + if (!IdentityMap->TopLevelDirectory) + { + IdentityMap->TopLevelDirectory = Ki386AllocateContiguousMemory(IdentityMap, 1, 1); + if (!IdentityMap->TopLevelDirectory) return FALSE; + } + + /* Get PDE of VirtualPtr and make it writable and valid */ + Pde = &IdentityMap->TopLevelDirectory[(VirtualPtr >> 22) & ((1 << PDE_BITS) - 1)]; + if (!Ki386IdentityMapMakeValid(IdentityMap, Pde, &PageTable)) return FALSE; + Pde->Write = 1; + + /* Get PTE of VirtualPtr, make it valid, and map PhysicalPtr there */ + Pte = &PageTable[(VirtualPtr >> 12) & ((1 << PTE_BITS) - 1)]; + Pte->Valid = 1; + Pte->PageFrameNumber = PhysicalPtr.QuadPart >> PAGE_SHIFT; + + return TRUE; +} + +VOID +NTAPI +Ki386ConvertPte(PHARDWARE_PTE Pte) +{ + PVOID VirtualPtr; + PHYSICAL_ADDRESS PhysicalPtr; + + /* Get virtual and physical addresses */ + VirtualPtr = (PVOID)(Pte->PageFrameNumber << PAGE_SHIFT); + PhysicalPtr = MmGetPhysicalAddress(VirtualPtr); + + /* Map its physical address in the page table provided by the caller */ + Pte->PageFrameNumber = PhysicalPtr.QuadPart >> PAGE_SHIFT; +} + +BOOLEAN +NTAPI +Ki386CreateIdentityMap(PLARGE_IDENTITY_MAP IdentityMap, PVOID StartPtr, ULONG PagesCount) +{ + ULONG_PTR Ptr; + ULONG PteIndex; + PHYSICAL_ADDRESS IdentityPtr; + + /* Zero out the IdentityMap contents */ + RtlZeroMemory(IdentityMap, sizeof(LARGE_IDENTITY_MAP)); + + /* Get the pointer to the physical address and save it in the struct */ + IdentityPtr = Ki386BuildIdentityBuffer(IdentityMap, StartPtr, PagesCount); + IdentityMap->StartAddress = IdentityPtr.LowPart; + if (IdentityMap->StartAddress == 0) + { + DPRINT1("Failed to get buffer for large pages identity mapping\n"); + return FALSE; + } + DPRINT("IdentityMap->StartAddress %p\n", IdentityMap->StartAddress); + + /* Map all pages */ + for (Ptr = (ULONG_PTR)StartPtr; + Ptr < (ULONG_PTR)StartPtr + PagesCount * PAGE_SIZE; + Ptr += PAGE_SIZE, IdentityPtr.QuadPart += PAGE_SIZE) + { + /* Map virtual address */ + if (!Ki386MapAddress(IdentityMap, Ptr, IdentityPtr)) return FALSE; + + /* Map physical address */ + if (!Ki386MapAddress(IdentityMap, IdentityPtr.LowPart, IdentityPtr)) return FALSE; + } + + /* Convert all PTEs in the page directory from virtual to physical, + because Ki386IdentityMapMakeValid mapped only virtual addresses */ + for (PteIndex = 0; PteIndex < (PAGE_SIZE / sizeof(HARDWARE_PTE)); PteIndex++) + { + if (IdentityMap->TopLevelDirectory[PteIndex].Valid != 0) + Ki386ConvertPte(&IdentityMap->TopLevelDirectory[PteIndex]); + } + + /* Save the page directory address (allocated by Ki386MapAddress) */ + IdentityMap->Cr3 = MmGetPhysicalAddress(IdentityMap->TopLevelDirectory).LowPart; + + DPRINT("IdentityMap->Cr3 0x%x\n", IdentityMap->Cr3); + + return TRUE; +} + +VOID +NTAPI +Ki386FreeIdentityMap(PLARGE_IDENTITY_MAP IdentityMap) +{ + ULONG Page; + + DPRINT("Freeing %d pages allocated for identity mapping\n", IdentityMap->PagesCount); + + /* Free all allocated pages, if any */ + for (Page = 0; Page < IdentityMap->PagesCount; Page++) + MmFreeContiguousMemory(IdentityMap->PagesList[Page]); +}

1 0

[aandrejevic] 59490: [SOFTX86] Fix carry/overflow condition for the SUB instruction.
by aandrejevic＠svn.reactos.org 15 Jul '13

15 Jul '13

Author: aandrejevic Date: Mon Jul 15 02:34:45 2013 New Revision: 59490 URL: http://svn.reactos.org/svn/reactos?rev=59490&view=rev Log: [SOFTX86] Fix carry/overflow condition for the SUB instruction. Modified: branches/ntvdm/lib/3rdparty/softx86/softx86/add.c Modified: branches/ntvdm/lib/3rdparty/softx86/softx86/add.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/softx86/soft… ============================================================================== --- branches/ntvdm/lib/3rdparty/softx86/softx86/add.c [iso-8859-1] (original) +++ branches/ntvdm/lib/3rdparty/softx86/softx86/add.c [iso-8859-1] Mon Jul 15 02:34:45 2013 @@ -342,13 +342,16 @@ /* peform the addition */ ret = src - val; -/* if carry/overflow */ - if (ret > src) - ctx->state->reg_flags.val |= - (SX86_CPUFLAG_CARRY | SX86_CPUFLAG_OVERFLOW); - else - ctx->state->reg_flags.val &= - ~(SX86_CPUFLAG_CARRY | SX86_CPUFLAG_OVERFLOW); +/* if carry */ + if (val > src) ctx->state->reg_flags.val |= SX86_CPUFLAG_CARRY; + else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_CARRY; + +/* if overflow */ + if (((src & 0x80) != (val & 0x80)) && ((src & 0x80) != (ret & 0x80))) + { + ctx->state->reg_flags.val |= SX86_CPUFLAG_OVERFLOW; + } + else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_OVERFLOW; /* if result treated as signed value is negative */ if (ret & 0x80) ctx->state->reg_flags.val |= SX86_CPUFLAG_SIGN; @@ -391,7 +394,10 @@ else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_CARRY; /* if overflow */ - if ((ret & 0x8000) != (src & 0x8000)) ctx->state->reg_flags.val |= SX86_CPUFLAG_OVERFLOW; + if (((src & 0x8000) != (val & 0x8000)) && ((src & 0x8000) != (ret & 0x8000))) + { + ctx->state->reg_flags.val |= SX86_CPUFLAG_OVERFLOW; + } else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_OVERFLOW; /* if result treated as signed value is negative */ @@ -430,13 +436,17 @@ /* peform the addition */ ret = src - val; -/* if carry/overflow */ - if (ret > src) - ctx->state->reg_flags.val |= - (SX86_CPUFLAG_CARRY | SX86_CPUFLAG_OVERFLOW); - else - ctx->state->reg_flags.val &= - ~(SX86_CPUFLAG_CARRY | SX86_CPUFLAG_OVERFLOW); +/* if carry */ + if (val > src) ctx->state->reg_flags.val |= SX86_CPUFLAG_CARRY; + else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_CARRY; + +/* if overflow */ + if (((src & 0x80000000) != (val & 0x80000000)) + && ((src & 0x80000000) != (ret & 0x80000000))) + { + ctx->state->reg_flags.val |= SX86_CPUFLAG_OVERFLOW; + } + else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_OVERFLOW; /* if result treated as signed value is negative */ if (ret & 0x80000000) ctx->state->reg_flags.val |= SX86_CPUFLAG_SIGN;

1 0

[aandrejevic] 59489: [NTVDM] Implement the Bios Data Area (BDA). Fix keyboard character translation bug.
by aandrejevic＠svn.reactos.org 15 Jul '13

15 Jul '13

Author: aandrejevic Date: Mon Jul 15 01:37:38 2013 New Revision: 59489 URL: http://svn.reactos.org/svn/reactos?rev=59489&view=rev Log: [NTVDM] Implement the Bios Data Area (BDA). Fix keyboard character translation bug. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Mon Jul 15 01:37:38 2013 @@ -16,23 +16,18 @@ /* PRIVATE VARIABLES **********************************************************/ +static PBIOS_DATA_AREA Bda; static BYTE BiosKeyboardMap[256]; -static WORD BiosKbdBuffer[BIOS_KBD_BUFFER_SIZE]; -static UINT BiosKbdBufferStart = 0, BiosKbdBufferEnd = 0; -static BOOLEAN BiosKbdBufferEmpty = TRUE; -static DWORD BiosTickCount = 0; -static BOOLEAN BiosPassedMidnight = FALSE; static HANDLE BiosConsoleInput = INVALID_HANDLE_VALUE; static HANDLE BiosConsoleOutput = INVALID_HANDLE_VALUE; -static BYTE CurrentVideoMode = BIOS_DEFAULT_VIDEO_MODE; -static BYTE CurrentVideoPage = 0; -static COORD BiosCursorPositions[BIOS_MAX_PAGES]; static HANDLE BiosGraphicsOutput = NULL; static LPVOID ConsoleFramebuffer = NULL; static HANDLE ConsoleMutex = NULL; +static BYTE CurrentVideoMode, CurrentVideoPage; static BOOLEAN VideoNeedsUpdate = TRUE; static SMALL_RECT UpdateRectangle = { 0, 0, 0, 0 }; static CONSOLE_SCREEN_BUFFER_INFO BiosSavedBufferInfo; + static VIDEO_MODE VideoModes[] = { /* Width | Height | Text | Bpp | Gray | Pages | Segment */ @@ -103,17 +98,25 @@ static BOOLEAN BiosKbdBufferPush(WORD Data) { + /* Get the location of the element after the head */ + WORD NextElement = Bda->KeybdBufferHead + 2; + + /* Wrap it around if it's at or beyond the end */ + if (NextElement >= Bda->KeybdBufferEnd) NextElement = Bda->KeybdBufferStart; + /* If it's full, fail */ - if (!BiosKbdBufferEmpty && (BiosKbdBufferStart == BiosKbdBufferEnd)) - { - return FALSE; - } - - /* Otherwise, add the value to the queue */ - BiosKbdBuffer[BiosKbdBufferEnd] = Data; - BiosKbdBufferEnd++; - BiosKbdBufferEnd %= BIOS_KBD_BUFFER_SIZE; - BiosKbdBufferEmpty = FALSE; + if (NextElement == Bda->KeybdBufferTail) return FALSE; + + /* Put the value in the queue */ + *((LPWORD)((ULONG_PTR)Bda + Bda->KeybdBufferTail)) = Data; + Bda->KeybdBufferTail += sizeof(WORD); + + /* Check if we are at, or have passed, the end of the buffer */ + if (Bda->KeybdBufferTail >= Bda->KeybdBufferEnd) + { + /* Return it to the beginning */ + Bda->KeybdBufferTail = Bda->KeybdBufferStart; + } /* Return success */ return TRUE; @@ -122,23 +125,30 @@ static BOOLEAN BiosKbdBufferTop(LPWORD Data) { /* If it's empty, fail */ - if (BiosKbdBufferEmpty) return FALSE; + if (Bda->KeybdBufferHead == Bda->KeybdBufferTail) return FALSE; /* Otherwise, get the value and return success */ - *Data = BiosKbdBuffer[BiosKbdBufferStart]; + *Data = *((LPWORD)((ULONG_PTR)Bda + Bda->KeybdBufferHead)); + return TRUE; } static BOOLEAN BiosKbdBufferPop() { /* If it's empty, fail */ - if (BiosKbdBufferEmpty) return FALSE; - - /* Otherwise, remove the value and return success */ - BiosKbdBufferStart++; - BiosKbdBufferStart %= BIOS_KBD_BUFFER_SIZE; - if (BiosKbdBufferStart == BiosKbdBufferEnd) BiosKbdBufferEmpty = TRUE; - + if (Bda->KeybdBufferHead == Bda->KeybdBufferTail) return FALSE; + + /* Remove the value from the queue */ + Bda->KeybdBufferHead += sizeof(WORD); + + /* Check if we are at, or have passed, the end of the buffer */ + if (Bda->KeybdBufferHead >= Bda->KeybdBufferEnd) + { + /* Return it to the beginning */ + Bda->KeybdBufferHead = Bda->KeybdBufferStart; + } + + /* Return success */ return TRUE; } @@ -271,8 +281,16 @@ SetConsoleActiveScreenBuffer(BiosGraphicsOutput); } - /* Set the video mode */ + /* Change the mode number */ CurrentVideoMode = ModeNumber; + CurrentVideoPage = 0; + + /* Update the BDA */ + Bda->VideoMode = CurrentVideoMode; + Bda->VideoPage = CurrentVideoPage; + Bda->VideoPageSize = BiosGetVideoPageSize(); + Bda->VideoPageOffset = 0; + Bda->ScreenColumns = VideoModes[ModeNumber].Width; return TRUE; } @@ -280,6 +298,7 @@ BOOLEAN BiosSetVideoPage(BYTE PageNumber) { ULONG PageStart; + COORD Coordinates; CONSOLE_SCREEN_BUFFER_INFO BufferInfo; /* Make sure this is a valid page number */ @@ -291,17 +310,25 @@ /* Save the cursor */ if (!GetConsoleScreenBufferInfo(BiosConsoleOutput, &BufferInfo)) return FALSE; - BiosCursorPositions[CurrentVideoPage] = BufferInfo.dwCursorPosition; + Bda->CursorPosition[CurrentVideoPage] = MAKEWORD(BufferInfo.dwCursorPosition.X, + BufferInfo.dwCursorPosition.Y); /* Set the page */ CurrentVideoPage = PageNumber; + /* Update the BDA */ + Bda->VideoPage = CurrentVideoPage; + Bda->VideoPageSize = BiosGetVideoPageSize(); + Bda->VideoPageOffset = CurrentVideoPage * Bda->VideoPageSize; + /* Update the console */ - PageStart = BiosGetVideoMemoryStart() + CurrentVideoPage * BiosGetVideoPageSize(); + PageStart = BiosGetVideoMemoryStart() + Bda->VideoPage * BiosGetVideoPageSize(); BiosUpdateConsole(PageStart, PageStart + BiosGetVideoPageSize()); /* Set the cursor */ - SetConsoleCursorPosition(BiosConsoleOutput, BiosCursorPositions[PageNumber]); + Coordinates.X = LOBYTE(Bda->CursorPosition[Bda->VideoPage]); + Coordinates.Y = HIBYTE(Bda->CursorPosition[Bda->VideoPage]); + SetConsoleCursorPosition(BiosConsoleOutput, Coordinates); return TRUE; } @@ -332,6 +359,12 @@ WORD Offset = 0; LPWORD IntVecTable = (LPWORD)((ULONG_PTR)BaseAddress); LPBYTE BiosCode = (LPBYTE)((ULONG_PTR)BaseAddress + TO_LINEAR(BIOS_SEGMENT, 0)); + + /* Initialize the BDA */ + Bda = (PBIOS_DATA_AREA)((ULONG_PTR)BaseAddress + TO_LINEAR(BDA_SEGMENT, 0)); + Bda->EquipmentList = BIOS_EQUIPMENT_LIST; + Bda->KeybdBufferStart = FIELD_OFFSET(BIOS_DATA_AREA, KeybdBuffer); + Bda->KeybdBufferEnd = Bda->KeybdBufferStart + BIOS_KBD_BUFFER_SIZE * sizeof(WORD); /* Generate ISR stubs and fill the IVT */ for (i = 0; i < 256; i++) @@ -388,8 +421,8 @@ } /* Store the cursor position */ - ZeroMemory(&BiosCursorPositions, sizeof(BiosCursorPositions)); - BiosCursorPositions[0] = BiosSavedBufferInfo.dwCursorPosition; + Bda->CursorPosition[0] = MAKEWORD(BiosSavedBufferInfo.dwCursorPosition.X, + BiosSavedBufferInfo.dwCursorPosition.Y); /* Set the default video mode */ BiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); @@ -582,7 +615,7 @@ WORD CharacterData; /* Check if there is a key available */ - if (BiosKbdBufferEmpty) return 0xFFFF; + if (Bda->KeybdBufferHead == Bda->KeybdBufferTail) return 0xFFFF; /* Get the key from the queue, but don't remove it */ BiosKbdBufferTop(&CharacterData); @@ -597,7 +630,7 @@ DWORD Count; /* Check if there is a key available */ - if (!BiosKbdBufferEmpty) + if (Bda->KeybdBufferHead != Bda->KeybdBufferTail) { /* Get the key from the queue, and remove it */ BiosKbdBufferTop(&CharacterData); @@ -673,15 +706,14 @@ /* Make sure the selected video page exists */ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - Position.X = LOBYTE(Edx); - Position.Y = HIBYTE(Edx); - - BiosCursorPositions[HIBYTE(Ebx)] = Position; + Bda->CursorPosition[HIBYTE(Ebx)] = LOWORD(Edx); /* Check if this is the current video page */ if (HIBYTE(Ebx) == CurrentVideoPage) { /* Yes, change the actual cursor */ + Position.X = LOBYTE(Edx); + Position.Y = HIBYTE(Edx); SetConsoleCursorPosition(BiosConsoleOutput, Position); } @@ -705,9 +737,8 @@ /* Return the result */ EmulatorSetRegister(EMULATOR_REG_AX, 0); EmulatorSetRegister(EMULATOR_REG_CX, (StartLine << 8) | 0x1F); - EmulatorSetRegister(EMULATOR_REG_DX, - (LOBYTE(BiosCursorPositions[HIBYTE(Ebx)].Y) << 8) - | LOBYTE(BiosCursorPositions[HIBYTE(Ebx)].X)); + EmulatorSetRegister(EMULATOR_REG_DX, Bda->CursorPosition[HIBYTE(Ebx)]); + break; } @@ -877,10 +908,9 @@ case 0x0F: { EmulatorSetRegister(EMULATOR_REG_AX, - (VideoModes[CurrentVideoMode].Width << 8) - | CurrentVideoMode); + MAKEWORD(Bda->VideoMode, Bda->ScreenColumns)); EmulatorSetRegister(EMULATOR_REG_BX, - (CurrentVideoPage << 8) | LOBYTE(Ebx)); + MAKEWORD(LOBYTE(Ebx), Bda->VideoPage)); break; } @@ -946,15 +976,15 @@ { /* Set AL to 1 if midnight had passed, 0 otherwise */ Eax &= 0xFFFFFF00; - if (BiosPassedMidnight) Eax |= 1; + if (Bda->MidnightPassed) Eax |= 1; /* Return the tick count in CX:DX */ EmulatorSetRegister(EMULATOR_REG_AX, Eax); - EmulatorSetRegister(EMULATOR_REG_CX, HIWORD(BiosTickCount)); - EmulatorSetRegister(EMULATOR_REG_DX, LOWORD(BiosTickCount)); + EmulatorSetRegister(EMULATOR_REG_CX, HIWORD(Bda->TickCounter)); + EmulatorSetRegister(EMULATOR_REG_DX, LOWORD(Bda->TickCounter)); /* Reset the midnight flag */ - BiosPassedMidnight = FALSE; + Bda->MidnightPassed = FALSE; break; } @@ -962,10 +992,10 @@ case 0x01: { /* Set the tick count to CX:DX */ - BiosTickCount = MAKELONG(LOWORD(Edx), LOWORD(Ecx)); + Bda->TickCounter = MAKELONG(LOWORD(Edx), LOWORD(Ecx)); /* Reset the midnight flag */ - BiosPassedMidnight = FALSE; + Bda->MidnightPassed = FALSE; break; } @@ -981,13 +1011,13 @@ VOID BiosSystemTimerInterrupt() { /* Increase the system tick count */ - BiosTickCount++; + Bda->TickCounter++; } VOID BiosEquipmentService() { /* Return the equipment list */ - EmulatorSetRegister(EMULATOR_REG_AX, BIOS_EQUIPMENT_LIST); + EmulatorSetRegister(EMULATOR_REG_AX, Bda->EquipmentList); } VOID BiosHandleIrq(BYTE IrqNumber) @@ -1014,7 +1044,7 @@ /* Get the scan code and virtual key code */ ScanCode = KeyboardReadData(); - VirtualKey = MapVirtualKey(ScanCode, MAPVK_VSC_TO_VK); + VirtualKey = MapVirtualKey(ScanCode & 0x7F, MAPVK_VSC_TO_VK); /* Check if this is a key press or release */ if (!(ScanCode & (1 << 7))) @@ -1032,10 +1062,11 @@ BiosKeyboardMap[VirtualKey] |= (1 << 7); /* Find out which character this is */ - ToAscii(ScanCode, VirtualKey, BiosKeyboardMap, &Character, 0); - - /* Push it onto the BIOS keyboard queue */ - BiosKbdBufferPush((ScanCode << 8) | (Character & 0xFF)); + if (ToAscii(VirtualKey, ScanCode, BiosKeyboardMap, &Character, 0) > 0) + { + /* Push it onto the BIOS keyboard queue */ + BiosKbdBufferPush((ScanCode << 8) | (Character & 0xFF)); + } } else { Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Mon Jul 15 01:37:38 2013 @@ -18,6 +18,7 @@ #define CONSOLE_VIDEO_MEM_END 0xBFFFF #define ROM_AREA_START 0xC0000 #define ROM_AREA_END 0xFFFFF +#define BDA_SEGMENT 0x40 #define BIOS_PIC_MASTER_INT 0x08 #define BIOS_PIC_SLAVE_INT 0x70 #define BIOS_SEGMENT 0xF000 @@ -27,8 +28,8 @@ #define BIOS_TIME_INTERRUPT 0x1A #define BIOS_SYS_TIMER_INTERRUPT 0x1C #define CONSOLE_FONT_HEIGHT 8 -#define BIOS_KBD_BUFFER_SIZE 256 -#define BIOS_EQUIPMENT_LIST 0x3C // HACK: Disable FPU for now +#define BIOS_KBD_BUFFER_SIZE 16 +#define BIOS_EQUIPMENT_LIST 0x2C // HACK: Disable FPU for now #define BIOS_DEFAULT_VIDEO_MODE 0x03 #define BIOS_MAX_PAGES 8 #define BIOS_MAX_VIDEO_MODE 0x13 @@ -43,6 +44,56 @@ BYTE Pages; WORD Segment; } VIDEO_MODE; + +#pragma pack(push, 1) + +typedef struct +{ + WORD SerialPorts[4]; + WORD ParallelPorts[3]; + WORD EbdaSegment; + WORD EquipmentList; + BYTE Reserved0; + WORD MemorySize; + WORD Reserved1; + WORD KeyboardFlags; + BYTE AlternateKeypad; + WORD KeybdBufferHead; + WORD KeybdBufferTail; + WORD KeybdBuffer[BIOS_KBD_BUFFER_SIZE]; + BYTE DriveRecalibrate; + BYTE DriveMotorStatus; + BYTE MotorShutdownCounter; + BYTE LastDisketteOperation; + BYTE Reserved2[7]; + BYTE VideoMode; + WORD ScreenColumns; + WORD VideoPageSize; + WORD VideoPageOffset; + WORD CursorPosition[BIOS_MAX_PAGES]; + BYTE CursorEndLine; + BYTE CursorStartLine; + BYTE VideoPage; + WORD CrtBasePort; + BYTE CrtModeControl; + BYTE CrtColorPaletteMask; + DWORD Uptime; + BYTE Reserved3; + DWORD TickCounter; + BYTE MidnightPassed; + BYTE BreakFlag; + WORD SoftReset; + BYTE LastDiskOperation; + BYTE NumDisks; + BYTE DriveControlByte; + BYTE DiskPortOffset; + BYTE LptTimeOut[4]; + BYTE ComTimeOut[4]; + WORD KeybdBufferStart; + WORD KeybdBufferEnd; +} BIOS_DATA_AREA, *PBIOS_DATA_AREA; + +#pragma pack(pop) /* FUNCTIONS ******************************************************************/

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