Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 61271: [BROWSEUI] - Actually return the operation result.
by jgardou＠svn.reactos.org 14 Dec '13

14 Dec '13

Author: jgardou Date: Sat Dec 14 16:10:59 2013 New Revision: 61271 URL: http://svn.reactos.org/svn/reactos?rev=61271&view=rev Log: [BROWSEUI] - Actually return the operation result. Modified: trunk/reactos/dll/win32/browseui/bandsite.cpp Modified: trunk/reactos/dll/win32/browseui/bandsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsite.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsite.cpp [iso-8859-1] Sat Dec 14 16:10:59 2013 @@ -744,7 +744,7 @@ default: return E_FAIL; } - return S_OK; + return hRet; } else WARN("IOleCommandTarget::Exec(): Unsupported command group GUID\n");

1 0

[ekohl] 61270: [DEVMGR] CORE-6350 Hack: Call the "Install hardware" wizard when the user clicks the "update driver" button.
by ekohl＠svn.reactos.org 14 Dec '13

14 Dec '13

Author: ekohl Date: Sat Dec 14 15:58:35 2013 New Revision: 61270 URL: http://svn.reactos.org/svn/reactos?rev=61270&view=rev Log: [DEVMGR] CORE-6350 Hack: Call the "Install hardware" wizard when the user clicks the "update driver" button. Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr/precomp.h Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Sat Dec 14 15:58:35 2013 @@ -398,6 +398,73 @@ return Ret; } +BOOL +WINAPI +DevInstallW( + IN HWND hWndParent, + IN HINSTANCE hInstance, + IN LPCWSTR InstanceId, + IN INT Show); + +static +VOID +UpdateDriver( + IN HWND hwndDlg, + IN PDEVADVPROP_INFO dap) +{ + TOKEN_PRIVILEGES Privileges; + HANDLE hToken; + BOOL NeedReboot = FALSE; + + // Better use InstallDevInst: + // BOOL + // WINAPI + // InstallDevInst( + // HWND hWnd, + // LPWSTR wszDeviceId, + // BOOL bUpdate, + // DWORD *dwReboot); + // See: http://comp.os.ms-windows.programmer.win32.narkive.com/J8FTd4KK/signature-o… + if (!DevInstallW(hwndDlg, NULL, dap->szDeviceID, SW_SHOWNOACTIVATE)) + return; + + if (NeedReboot == FALSE) + return; + + //FIXME: load text from resource file + if (MessageBoxW(hwndDlg, L"Reboot now?", L"Reboot required", MB_YESNO | MB_ICONQUESTION) != IDYES) + return; + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) + { + DPRINT("OpenProcessToken failed\n"); + return; + } + + /* Get the LUID for the Shutdown privilege */ + if (!LookupPrivilegeValueW(NULL, SE_SHUTDOWN_NAME, &Privileges.Privileges[0].Luid)) + { + DPRINT("LookupPrivilegeValue failed\n"); + return; + } + + /* Assign the Shutdown privilege to our process */ + Privileges.PrivilegeCount = 1; + Privileges.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + + if (!AdjustTokenPrivileges(hToken, FALSE, &Privileges, 0, NULL, NULL)) + { + DPRINT("AdjustTokenPrivileges failed\n"); + return; + } + + /* Finally shut down the system */ + if (!ExitWindowsEx(EWX_REBOOT, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | SHTDN_REASON_FLAG_PLANNED)) + { + DPRINT("ExitWindowsEx failed\n"); + } +} + static VOID UpdateDriverDlg(IN HWND hwndDlg, @@ -486,64 +553,16 @@ switch (LOWORD(wParam)) { case IDC_DRIVERDETAILS: - { DialogBoxParam(hDllInstance, MAKEINTRESOURCE(IDD_DRIVERDETAILS), hwndDlg, DriverDetailsDlgProc, (ULONG_PTR)dap); break; - } + case IDC_UPDATEDRIVER: - { - if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) - { - BOOL NeedReboot; - if (DiShowUpdateDevice(hwndDlg, dap->CurrentDeviceInfoSet, &dap->CurrentDeviceInfoData, 0, &NeedReboot)) - { - if (NeedReboot) - { - //FIXME: load text from resource file - if(MessageBoxW(hwndDlg, L"Reboot now?", L"Reboot required", MB_YESNO | MB_ICONQUESTION) == IDYES) - { - HANDLE hToken; - TOKEN_PRIVILEGES Privileges; - - if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) - { - DPRINT("OpenProcessToken failed\n"); - break; - } - - /* Get the LUID for the Shutdown privilege */ - if (!LookupPrivilegeValueW(NULL, SE_SHUTDOWN_NAME, &Privileges.Privileges[0].Luid)) - { - DPRINT("LookupPrivilegeValue failed\n"); - break; - } - - /* Assign the Shutdown privilege to our process */ - Privileges.PrivilegeCount = 1; - Privileges.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - - if (!AdjustTokenPrivileges(hToken, FALSE, &Privileges, 0, NULL, NULL)) - { - DPRINT("AdjustTokenPrivileges failed\n"); - break; - } - - /* Finally shut down the system */ - if(!ExitWindowsEx(EWX_REBOOT, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | SHTDN_REASON_FLAG_PLANNED)) - { - DPRINT("ExitWindowsEx failed\n"); - break; - } - } - } - } - } + UpdateDriver(hwndDlg, dap); break; - } } break; } Modified: trunk/reactos/dll/win32/devmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] Sat Dec 14 15:58:35 2013 @@ -8,8 +8,6 @@ #include <regstr.h> #include <setupapi.h> #include <cfgmgr32.h> -#undef WINVER -#define WINVER _WIN32_WINNT_VISTA #include <newdev.h> #include <dll/devmgr/devmgr.h>

1 0

[aandrejevic] 61269: [FAST486] The LDT can be loaded with a NULL descriptor. That invalidates the LDT but doesn't cause any exception.
by aandrejevic＠svn.reactos.org 14 Dec '13

14 Dec '13

Author: aandrejevic Date: Sat Dec 14 02:30:42 2013 New Revision: 61269 URL: http://svn.reactos.org/svn/reactos?rev=61269&view=rev Log: [FAST486] The LDT can be loaded with a NULL descriptor. That invalidates the LDT but doesn't cause any exception. Modified: branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Sat Dec 14 02:30:42 2013 @@ -1798,8 +1798,8 @@ if (GET_SEGMENT_INDEX(Selector) == 0) { - Fast486Exception(State, FAST486_EXCEPTION_GP); - return FALSE; + RtlZeroMemory(&State->Ldtr, sizeof(State->Ldtr)); + return TRUE; } if (!GdtEntry.Present)

1 0

[aandrejevic] 61268: [FAST486] Fix the emulation of the Local Descriptor Table.
by aandrejevic＠svn.reactos.org 14 Dec '13

14 Dec '13

Author: aandrejevic Date: Sat Dec 14 02:13:01 2013 New Revision: 61268 URL: http://svn.reactos.org/svn/reactos?rev=61268&view=rev Log: [FAST486] Fix the emulation of the Local Descriptor Table. Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h branches/ntvdm/lib/fast486/common.inl branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Sat Dec 14 02:13:01 2013 @@ -81,6 +81,7 @@ #define FAST486_IDT_INT_GATE_32 0xE #define FAST486_IDT_TRAP_GATE_32 0xF +#define FAST486_LDT_SIGNATURE 0x02 #define FAST486_TSS_SIGNATURE 0x09 #define FAST486_PREFIX_SEG (1 << 0) @@ -261,6 +262,13 @@ USHORT Selector; ULONG Base; ULONG Limit; +} FAST486_LDT_REG; + +typedef struct +{ + USHORT Selector; + ULONG Base; + ULONG Limit; BOOLEAN Busy; } FAST486_TASK_REG, *PFAST486_TASK_REG; @@ -302,10 +310,10 @@ ULONG Reserved : 2; ULONG Granularity : 1; ULONG BaseHigh : 8; -} FAST486_TSS_DESCRIPTOR, *PFAST486_TSS_DESCRIPTOR; +} FAST486_SYSTEM_DESCRIPTOR, *PFAST486_SYSTEM_DESCRIPTOR; /* Verify the structure size */ -C_ASSERT(sizeof(FAST486_TSS_DESCRIPTOR) == sizeof(ULONGLONG)); +C_ASSERT(sizeof(FAST486_SYSTEM_DESCRIPTOR) == sizeof(ULONGLONG)); typedef struct { @@ -467,7 +475,8 @@ FAST486_SEG_REG SegmentRegs[FAST486_NUM_SEG_REGS]; FAST486_REG InstPtr, SavedInstPtr; FAST486_FLAGS_REG Flags; - FAST486_TABLE_REG Gdtr, Idtr, Ldtr; + FAST486_TABLE_REG Gdtr, Idtr; + FAST486_LDT_REG Ldtr; FAST486_TASK_REG TaskReg; UCHAR Cpl; ULONG ControlRegisters[FAST486_NUM_CTRL_REGS]; Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Sat Dec 14 02:13:01 2013 @@ -420,7 +420,7 @@ else { /* Make sure the LDT contains the entry */ - if (GET_SEGMENT_INDEX(Selector) >= (State->Ldtr.Size + 1)) + if (GET_SEGMENT_INDEX(Selector) >= (State->Ldtr.Limit + 1)) { Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); return FALSE; @@ -428,7 +428,7 @@ /* Read the LDT */ if (!Fast486ReadLinearMemory(State, - State->Ldtr.Address + State->Ldtr.Base + GET_SEGMENT_INDEX(Selector), &GdtEntry, sizeof(GdtEntry))) Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Sat Dec 14 02:13:01 2013 @@ -1702,10 +1702,8 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0F00) { - UCHAR TableReg[6]; FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; - FAST486_SEG_REGS Segment = FAST486_REG_DS; NO_LOCK_PREFIX(); TOGGLE_ADSIZE(AddressSize); @@ -1716,36 +1714,23 @@ return FALSE; } - /* Check for the segment override */ - if (State->PrefixFlags & FAST486_PREFIX_SEG) - { - /* Use the override segment instead */ - Segment = State->SegmentOverride; - } - /* Check which operation this is */ switch (ModRegRm.Register) { /* SLDT */ case 0: { - if (!ModRegRm.Memory) - { - /* The second operand must be a memory location */ + /* Not recognized in real mode or virtual 8086 mode */ + if (!(State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + || State->Flags.Vm) + { Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } - - /* Fill the 6-byte table register */ - RtlCopyMemory(TableReg, &State->Ldtr.Size, sizeof(USHORT)); - RtlCopyMemory(&TableReg[sizeof(USHORT)], &State->Ldtr.Address, sizeof(ULONG)); - - /* Store the LDTR */ - return Fast486WriteMemory(State, - Segment, - ModRegRm.MemoryAddress, - TableReg, - sizeof(TableReg)); + } + + return Fast486WriteModrmWordOperands(State, + &ModRegRm, + FALSE, + State->Ldtr.Selector); } /* STR */ @@ -1767,6 +1752,16 @@ /* LLDT */ case 2: { + USHORT Selector; + FAST486_SYSTEM_DESCRIPTOR GdtEntry; + + /* Not recognized in real mode or virtual 8086 mode */ + if (!(State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + || State->Flags.Vm) + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + } + /* This is a privileged instruction */ if (Fast486GetCurrentPrivLevel(State) != 0) { @@ -1774,28 +1769,57 @@ return FALSE; } - if (!ModRegRm.Memory) - { - /* The second operand must be a memory location */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } - - /* Read the new LDTR */ - if (!Fast486ReadMemory(State, - Segment, - ModRegRm.MemoryAddress, - FALSE, - TableReg, - sizeof(TableReg))) - { - /* Exception occurred */ - return FALSE; - } - - /* Load the new LDT */ - State->Ldtr.Size = *((PUSHORT)TableReg); - State->Ldtr.Address = *((PULONG)&TableReg[sizeof(USHORT)]); + if (!Fast486ReadModrmWordOperands(State, + &ModRegRm, + NULL, + &Selector)) + { + /* Exception occurred */ + return FALSE; + } + + /* Make sure the GDT contains the entry */ + if (GET_SEGMENT_INDEX(Selector) >= (State->Gdtr.Size + 1)) + { + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); + return FALSE; + } + + /* Read the GDT */ + if (!Fast486ReadLinearMemory(State, + State->Gdtr.Address + + GET_SEGMENT_INDEX(Selector), + &GdtEntry, + sizeof(GdtEntry))) + { + /* Exception occurred */ + return FALSE; + } + + if (GET_SEGMENT_INDEX(Selector) == 0) + { + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + if (!GdtEntry.Present) + { + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_NP, Selector); + return FALSE; + } + + if (GdtEntry.Signature != FAST486_LDT_SIGNATURE) + { + /* This is not a LDT descriptor */ + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); + return FALSE; + } + + /* Update the LDTR */ + State->Ldtr.Selector = Selector; + State->Ldtr.Base = GdtEntry.Base | (GdtEntry.BaseMid << 16) | (GdtEntry.BaseHigh << 24); + State->Ldtr.Limit = GdtEntry.Limit | (GdtEntry.LimitHigh << 16); + if (GdtEntry.Granularity) State->Ldtr.Limit <<= 12; return TRUE; } @@ -1804,7 +1828,7 @@ case 3: { USHORT Selector; - FAST486_TSS_DESCRIPTOR GdtEntry; + FAST486_SYSTEM_DESCRIPTOR GdtEntry; /* Not recognized in real mode or virtual 8086 mode */ if (!(State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) @@ -1930,7 +1954,7 @@ else { /* Make sure the LDT contains the entry */ - if (GET_SEGMENT_INDEX(Selector) >= (State->Ldtr.Size + 1)) + if (GET_SEGMENT_INDEX(Selector) >= (State->Ldtr.Limit + 1)) { /* Clear ZF */ State->Flags.Zf = FALSE; @@ -1939,7 +1963,7 @@ /* Read the LDT */ if (!Fast486ReadLinearMemory(State, - State->Ldtr.Address + State->Ldtr.Base + GET_SEGMENT_INDEX(Selector), &GdtEntry, sizeof(GdtEntry)))

1 0

[hbelusca] 61267: [NTVDM]: VGA: Fix VGA_DAC_TO_COLOR macro (/me looks at [TheFlash]... :) )
by hbelusca＠svn.reactos.org 13 Dec '13

13 Dec '13

Author: hbelusca Date: Fri Dec 13 23:14:33 2013 New Revision: 61267 URL: http://svn.reactos.org/svn/reactos?rev=61267&view=rev Log: [NTVDM]: VGA: Fix VGA_DAC_TO_COLOR macro (/me looks at [TheFlash]... :) ) Modified: branches/ntvdm/subsystems/ntvdm/vga.h Modified: branches/ntvdm/subsystems/ntvdm/vga.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] Fri Dec 13 23:14:33 2013 @@ -22,7 +22,7 @@ #define VGA_BITMAP_INFO_SIZE (sizeof(BITMAPINFOHEADER) + 2 * (VGA_PALETTE_SIZE / 3)) #define VGA_MINIMUM_WIDTH 400 #define VGA_MINIMUM_HEIGHT 300 -#define VGA_DAC_TO_COLOR(x) (((x) << 2) | ((x) >> 6)) +#define VGA_DAC_TO_COLOR(x) (((x) << 2) | ((x) >> 4)) #define VGA_COLOR_TO_DAC(x) ((x) >> 2)

1 0

[dgorbachev] 61266: [CMAKE] Use -ffat-lto-objects option for LTCG builds. GCC 4.9 now defaults to slim LTO, which (owing to linker bug #13557) fails with undefined reference errors. [LWIP] Compile ...
by dgorbachev＠svn.reactos.org 13 Dec '13

13 Dec '13

Author: dgorbachev Date: Fri Dec 13 17:50:57 2013 New Revision: 61266 URL: http://svn.reactos.org/svn/reactos?rev=61266&view=rev Log: [CMAKE] Use -ffat-lto-objects option for LTCG builds. GCC 4.9 now defaults to slim LTO, which (owing to linker bug #13557) fails with undefined reference errors. [LWIP] Compile with -fno-builtin-malloc -fno-builtin-free. GCC bug #56578. Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/lib/drivers/lwip/CMakeLists.txt Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=61266&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Fri Dec 13 17:50:57 2013 @@ -92,7 +92,7 @@ # Link-time code generation if(LTCG) - add_compile_flags("-flto -Wno-error=clobbered") + add_compile_flags("-flto -ffat-lto-objects") endif() if(ARCH STREQUAL "i386") Modified: trunk/reactos/lib/drivers/lwip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/CMakeList… ============================================================================== --- trunk/reactos/lib/drivers/lwip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/CMakeLists.txt [iso-8859-1] Fri Dec 13 17:50:57 2013 @@ -60,4 +60,7 @@ add_dependencies(lwip bugcodes) if(NOT MSVC) allow_warnings(lwip) + if(LTCG) + add_compile_flags("-fno-builtin-malloc -fno-builtin-free") + endif() endif()

1 0

[dgorbachev] 61265: [CMAKE][INCLUDE] - In DPRINT1(), ASSERT(), etc. - print relative (to REACTOS_SOURCE_DIR) paths to reduce debug log spam. - Unify GCC and MSVC versions of _WARN() macro.
by dgorbachev＠svn.reactos.org 13 Dec '13

13 Dec '13

Author: dgorbachev Date: Fri Dec 13 17:50:49 2013 New Revision: 61265 URL: http://svn.reactos.org/svn/reactos?rev=61265&view=rev Log: [CMAKE][INCLUDE] - In DPRINT1(), ASSERT(), etc. - print relative (to REACTOS_SOURCE_DIR) paths to reduce debug log spam. - Unify GCC and MSVC versions of _WARN() macro. Added: trunk/reactos/include/reactos/builddir.h.cmake (with props) Modified: trunk/reactos/include/reactos/debug.h trunk/reactos/include/reactos/version.cmake Added: trunk/reactos/include/reactos/builddir.h.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/builddir.h… ============================================================================== --- trunk/reactos/include/reactos/builddir.h.cmake (added) +++ trunk/reactos/include/reactos/builddir.h.cmake [iso-8859-1] Fri Dec 13 17:50:49 2013 @@ -0,0 +1,14 @@ +/* Do not edit - Machine generated */ + +#pragma once + +#define REACTOS_SOURCE_DIR "@REACTOS_SOURCE_DIR@" +#define REACTOS_BINARY_DIR "@REACTOS_BINARY_DIR@" + +#if defined(__GNUC__) && defined(__OPTIMIZE__) +#define __RELFILE__ \ + (!__builtin_strncmp(__FILE__, REACTOS_SOURCE_DIR, sizeof(REACTOS_SOURCE_DIR) - 1) \ + ? __FILE__ + sizeof(REACTOS_SOURCE_DIR) : __FILE__) +#endif + +/* EOF */ Propchange: trunk/reactos/include/reactos/builddir.h.cmake ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Fri Dec 13 17:50:49 2013 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: include/internal/debug.h + * FILE: include/reactos/debug.h * PURPOSE: Useful debugging macros * PROGRAMMERS: David Welch (welch(a)mcmail.com) * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) @@ -12,8 +12,13 @@ * to disable debugging macros. */ -#ifndef __INTERNAL_DEBUG -#define __INTERNAL_DEBUG +#pragma once + +#include <builddir.h> + +#if !defined(__RELFILE__) +#define __RELFILE__ __FILE__ +#endif /* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */ #if !defined(_RTLFUNCS_H) && !defined(_NTDDK_) @@ -63,7 +68,7 @@ #ifndef assert #if DBG && !defined(NASSERT) -#define assert(x) if (!(x)) { RtlAssert((PVOID)#x, (PVOID)__FILE__, __LINE__, ""); } +#define assert(x) if (!(x)) { RtlAssert((PVOID)#x, (PVOID)__RELFILE__, __LINE__, ""); } #else #define assert(x) ((VOID) 0) #endif @@ -71,7 +76,7 @@ #ifndef ASSERT #if DBG && !defined(NASSERT) -#define ASSERT(x) if (!(x)) { RtlAssert((PVOID)#x, (PVOID)__FILE__, __LINE__, ""); } +#define ASSERT(x) if (!(x)) { RtlAssert((PVOID)#x, (PVOID)__RELFILE__, __LINE__, ""); } #else #define ASSERT(x) ((VOID) 0) #endif @@ -79,14 +84,14 @@ #ifndef ASSERTMSG #if DBG && !defined(NASSERT) -#define ASSERTMSG(m, x) if (!(x)) { RtlAssert((PVOID)#x, __FILE__, __LINE__, m); } +#define ASSERTMSG(m, x) if (!(x)) { RtlAssert((PVOID)#x, __RELFILE__, __LINE__, m); } #else #define ASSERTMSG(m, x) ((VOID) 0) #endif #endif /* For internal purposes only */ -#define __NOTICE(level, fmt, ...) DbgPrint(#level ": %s at %s:%d " fmt, __FUNCTION__, __FILE__, __LINE__, ##__VA_ARGS__) +#define __NOTICE(level, fmt, ...) DbgPrint(#level ": %s at %s:%d " fmt, __FUNCTION__, __RELFILE__, __LINE__, ##__VA_ARGS__) /* Print stuff only on Debug Builds*/ #define DPFLTR_DEFAULT_ID -1 @@ -94,16 +99,16 @@ /* These are always printed */ #define DPRINT1(fmt, ...) do { \ - if (DbgPrint("(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)) \ - DbgPrint("(%s:%d) DbgPrint() failed!\n", __FILE__, __LINE__); \ + if (DbgPrint("(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__)) \ + DbgPrint("(%s:%d) DbgPrint() failed!\n", __RELFILE__, __LINE__); \ } while (0) /* These are printed only if NDEBUG is NOT defined */ #ifndef NDEBUG #define DPRINT(fmt, ...) do { \ - if (DbgPrint("(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)) \ - DbgPrint("(%s:%d) DbgPrint() failed!\n", __FILE__, __LINE__); \ + if (DbgPrint("(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__)) \ + DbgPrint("(%s:%d) DbgPrint() failed!\n", __RELFILE__, __LINE__); \ } while (0) #else @@ -114,15 +119,15 @@ #define UNIMPLEMENTED __NOTICE(WARNING, "is UNIMPLEMENTED!\n"); - #define ERR_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - - #define ERR__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define WARN__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define TRACE__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define INFO__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define ERR_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + #define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + #define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + + #define ERR__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + #define WARN__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + #define TRACE__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + #define INFO__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) #else /* not DBG */ @@ -234,14 +239,10 @@ #define __STRING__(x) __STRING2__(x) #define __STRLINE__ __STRING__(__LINE__) -#define __TOKENPASTE2__(x, y) x ## y -#define __TOKENPASTE__(x, y) __TOKENPASTE2__(x, y) - -#ifdef _MSC_VER +#if !defined(_MSC_VER) && !defined(__pragma) +#define __pragma(x) _Pragma(#x) +#endif + #define _WARN(msg) __pragma(message("WARNING! Line " __STRLINE__ ": " msg)) -#else -#define _WARN1(_func1, _func2, _msg) void __attribute__((warning (_msg))) _func1(void); void __attribute__((used)) _func2(void) { _func1(); } -#define _WARN(_msg) _WARN1(__TOKENPASTE__(__warn_func1__, __LINE__), __TOKENPASTE__(__warn_func2__, __LINE__), _msg) -#endif - -#endif /* __INTERNAL_DEBUG */ + +/* EOF */ Modified: trunk/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.cm… ============================================================================== --- trunk/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.cmake [iso-8859-1] Fri Dec 13 17:50:49 2013 @@ -65,3 +65,4 @@ configure_file(include/reactos/version.h.cmake ${REACTOS_BINARY_DIR}/include/reactos/version.h) configure_file(include/reactos/buildno.h.cmake ${REACTOS_BINARY_DIR}/include/reactos/buildno.h) +configure_file(include/reactos/builddir.h.cmake ${REACTOS_BINARY_DIR}/include/reactos/builddir.h)

1 0

[aandrejevic] 61264: [FAST486] Implement the extended opcode group 0x0F, 0x00 (SLDT, STR, LLDT, LTR, VERR, VERW).
by aandrejevic＠svn.reactos.org 13 Dec '13

13 Dec '13

Author: aandrejevic Date: Fri Dec 13 03:32:41 2013 New Revision: 61264 URL: http://svn.reactos.org/svn/reactos?rev=61264&view=rev Log: [FAST486] Implement the extended opcode group 0x0F, 0x00 (SLDT, STR, LLDT, LTR, VERR, VERW). Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h branches/ntvdm/lib/fast486/common.c branches/ntvdm/lib/fast486/extraops.c branches/ntvdm/lib/fast486/opgroups.c branches/ntvdm/lib/fast486/opgroups.h Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Fri Dec 13 03:32:41 2013 @@ -81,6 +81,8 @@ #define FAST486_IDT_INT_GATE_32 0xE #define FAST486_IDT_TRAP_GATE_32 0xF +#define FAST486_TSS_SIGNATURE 0x09 + #define FAST486_PREFIX_SEG (1 << 0) #define FAST486_PREFIX_OPSIZE (1 << 1) #define FAST486_PREFIX_ADSIZE (1 << 2) @@ -254,6 +256,14 @@ ULONG Base; } FAST486_SEG_REG, *PFAST486_SEG_REG; +typedef struct +{ + USHORT Selector; + ULONG Base; + ULONG Limit; + BOOLEAN Busy; +} FAST486_TASK_REG, *PFAST486_TASK_REG; + #pragma pack(push, 1) typedef struct @@ -278,6 +288,24 @@ /* Verify the structure size */ C_ASSERT(sizeof(FAST486_GDT_ENTRY) == sizeof(ULONGLONG)); + +typedef struct +{ + ULONG Limit : 16; + ULONG Base : 16; + ULONG BaseMid : 8; + ULONG Signature : 5; + ULONG Dpl : 2; + ULONG Present : 1; + ULONG LimitHigh : 4; + ULONG Avl : 1; + ULONG Reserved : 2; + ULONG Granularity : 1; + ULONG BaseHigh : 8; +} FAST486_TSS_DESCRIPTOR, *PFAST486_TSS_DESCRIPTOR; + +/* Verify the structure size */ +C_ASSERT(sizeof(FAST486_TSS_DESCRIPTOR) == sizeof(ULONGLONG)); typedef struct { @@ -439,7 +467,8 @@ FAST486_SEG_REG SegmentRegs[FAST486_NUM_SEG_REGS]; FAST486_REG InstPtr, SavedInstPtr; FAST486_FLAGS_REG Flags; - FAST486_TABLE_REG Gdtr, Idtr, Ldtr, Tss; + FAST486_TABLE_REG Gdtr, Idtr, Ldtr; + FAST486_TASK_REG TaskReg; UCHAR Cpl; ULONG ControlRegisters[FAST486_NUM_CTRL_REGS]; ULONG DebugRegisters[FAST486_NUM_DBG_REGS]; Modified: branches/ntvdm/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.c [iso-8859-1] Fri Dec 13 03:32:41 2013 @@ -178,7 +178,7 @@ { /* Read the TSS */ if (!Fast486ReadLinearMemory(State, - State->Tss.Address, + State->TaskReg.Base, &Tss, sizeof(Tss))) { Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Fri Dec 13 03:32:41 2013 @@ -37,7 +37,7 @@ FAST486_OPCODE_HANDLER_PROC Fast486ExtendedHandlers[FAST486_NUM_OPCODE_HANDLERS] = { - NULL, // TODO: OPCODE 0x00 NOT IMPLEMENTED + Fast486OpcodeGroup0F00, Fast486OpcodeGroup0F01, NULL, // TODO: OPCODE 0x02 NOT IMPLEMENTED NULL, // TODO: OPCODE 0x03 NOT IMPLEMENTED Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Fri Dec 13 03:32:41 2013 @@ -1700,6 +1700,288 @@ return TRUE; } +FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0F00) +{ + UCHAR TableReg[6]; + FAST486_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + FAST486_SEG_REGS Segment = FAST486_REG_DS; + + NO_LOCK_PREFIX(); + TOGGLE_ADSIZE(AddressSize); + + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check for the segment override */ + if (State->PrefixFlags & FAST486_PREFIX_SEG) + { + /* Use the override segment instead */ + Segment = State->SegmentOverride; + } + + /* Check which operation this is */ + switch (ModRegRm.Register) + { + /* SLDT */ + case 0: + { + if (!ModRegRm.Memory) + { + /* The second operand must be a memory location */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; + } + + /* Fill the 6-byte table register */ + RtlCopyMemory(TableReg, &State->Ldtr.Size, sizeof(USHORT)); + RtlCopyMemory(&TableReg[sizeof(USHORT)], &State->Ldtr.Address, sizeof(ULONG)); + + /* Store the LDTR */ + return Fast486WriteMemory(State, + Segment, + ModRegRm.MemoryAddress, + TableReg, + sizeof(TableReg)); + } + + /* STR */ + case 1: + { + /* Not recognized in real mode or virtual 8086 mode */ + if (!(State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + || State->Flags.Vm) + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + } + + return Fast486WriteModrmWordOperands(State, + &ModRegRm, + FALSE, + State->TaskReg.Selector); + } + + /* LLDT */ + case 2: + { + /* This is a privileged instruction */ + if (Fast486GetCurrentPrivLevel(State) != 0) + { + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + if (!ModRegRm.Memory) + { + /* The second operand must be a memory location */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; + } + + /* Read the new LDTR */ + if (!Fast486ReadMemory(State, + Segment, + ModRegRm.MemoryAddress, + FALSE, + TableReg, + sizeof(TableReg))) + { + /* Exception occurred */ + return FALSE; + } + + /* Load the new LDT */ + State->Ldtr.Size = *((PUSHORT)TableReg); + State->Ldtr.Address = *((PULONG)&TableReg[sizeof(USHORT)]); + + return TRUE; + } + + /* LTR */ + case 3: + { + USHORT Selector; + FAST486_TSS_DESCRIPTOR GdtEntry; + + /* Not recognized in real mode or virtual 8086 mode */ + if (!(State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + || State->Flags.Vm) + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + } + + /* This is a privileged instruction */ + if (Fast486GetCurrentPrivLevel(State) != 0) + { + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + if (!Fast486ReadModrmWordOperands(State, + &ModRegRm, + NULL, + &Selector)) + { + /* Exception occurred */ + return FALSE; + } + + /* Make sure the GDT contains the entry */ + if (GET_SEGMENT_INDEX(Selector) >= (State->Gdtr.Size + 1)) + { + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); + return FALSE; + } + + /* Read the GDT */ + if (!Fast486ReadLinearMemory(State, + State->Gdtr.Address + + GET_SEGMENT_INDEX(Selector), + &GdtEntry, + sizeof(GdtEntry))) + { + /* Exception occurred */ + return FALSE; + } + + if (GET_SEGMENT_INDEX(Selector) == 0) + { + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + if (!GdtEntry.Present) + { + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_NP, Selector); + return FALSE; + } + + if (GdtEntry.Signature != FAST486_TSS_SIGNATURE) + { + /* This is not a TSS descriptor */ + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); + return FALSE; + } + + /* Update the TR */ + State->TaskReg.Selector = Selector; + State->TaskReg.Base = GdtEntry.Base | (GdtEntry.BaseMid << 16) | (GdtEntry.BaseHigh << 24); + State->TaskReg.Limit = GdtEntry.Limit | (GdtEntry.LimitHigh << 16); + if (GdtEntry.Granularity) State->TaskReg.Limit <<= 12; + State->TaskReg.Busy = TRUE; + + return TRUE; + } + + /* VERR/VERW */ + case 4: + case 5: + { + USHORT Selector; + FAST486_GDT_ENTRY GdtEntry; + + /* Not recognized in real mode or virtual 8086 mode */ + if (!(State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + || State->Flags.Vm) + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + } + + /* This is a privileged instruction */ + if (Fast486GetCurrentPrivLevel(State) != 0) + { + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + if (!Fast486ReadModrmWordOperands(State, + &ModRegRm, + NULL, + &Selector)) + { + /* Exception occurred */ + return FALSE; + } + + if (!(Selector & SEGMENT_TABLE_INDICATOR)) + { + /* Make sure the GDT contains the entry */ + if (GET_SEGMENT_INDEX(Selector) >= (State->Gdtr.Size + 1)) + { + /* Clear ZF */ + State->Flags.Zf = FALSE; + return TRUE; + } + + /* Read the GDT */ + if (!Fast486ReadLinearMemory(State, + State->Gdtr.Address + + GET_SEGMENT_INDEX(Selector), + &GdtEntry, + sizeof(GdtEntry))) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + /* Make sure the LDT contains the entry */ + if (GET_SEGMENT_INDEX(Selector) >= (State->Ldtr.Size + 1)) + { + /* Clear ZF */ + State->Flags.Zf = FALSE; + return TRUE; + } + + /* Read the LDT */ + if (!Fast486ReadLinearMemory(State, + State->Ldtr.Address + + GET_SEGMENT_INDEX(Selector), + &GdtEntry, + sizeof(GdtEntry))) + { + /* Exception occurred */ + return FALSE; + } + } + + /* Set ZF if it is valid and accessible */ + State->Flags.Zf = GdtEntry.Present // must be present + && GdtEntry.SystemType // must be a segment + && (((ModRegRm.Register == 4) + /* code segments are only readable if the RW bit is set */ + && (!GdtEntry.Executable || GdtEntry.ReadWrite)) + || ((ModRegRm.Register == 5) + /* code segments are never writable, data segments are writable when RW is set */ + && (!GdtEntry.Executable && GdtEntry.ReadWrite))) + /* + * for segments other than conforming code segments, + * both RPL and CPL must be less than or equal to DPL + */ + && ((!GdtEntry.Executable || !GdtEntry.DirConf) + && ((GET_SEGMENT_RPL(Selector) <= GdtEntry.Dpl) + && (Fast486GetCurrentPrivLevel(State) <= GdtEntry.Dpl))) + /* for conforming code segments, DPL must be less than or equal to CPL */ + && ((GdtEntry.Executable && GdtEntry.DirConf) + && (GdtEntry.Dpl <= Fast486GetCurrentPrivLevel(State))); + + + return TRUE; + } + + /* Invalid */ + default: + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; + } + } +} + FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0F01) { UCHAR TableReg[6]; Modified: branches/ntvdm/lib/fast486/opgroups.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.h?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.h [iso-8859-1] Fri Dec 13 03:32:41 2013 @@ -42,6 +42,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeGroupF7); FAST486_OPCODE_HANDLER(Fast486OpcodeGroupFE); FAST486_OPCODE_HANDLER(Fast486OpcodeGroupFF); +FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0F00); FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0F01); FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0FB9); FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0FBA);

1 0

[hbelusca] 61263: [NTVDM] - Add/fix few comments; - Don't forget to redisable access to AC registers after modifying them in int 10h. Usurp, please retest Rescue Rover 2 :) - Make EmulatorGet/Set/C...
by hbelusca＠svn.reactos.org 12 Dec '13

12 Dec '13

Author: hbelusca Date: Thu Dec 12 20:09:24 2013 New Revision: 61263 URL: http://svn.reactos.org/svn/reactos?rev=61263&view=rev Log: [NTVDM] - Add/fix few comments; - Don't forget to redisable access to AC registers after modifying them in int 10h. Usurp, please retest Rescue Rover 2 :) - Make EmulatorGet/Set/ClearFlag internal functions only and use set/get<FLAG> instead. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/registers.c branches/ntvdm/subsystems/ntvdm/registers.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] Thu Dec 12 20:09:24 2013 @@ -260,7 +260,7 @@ &VideoMode_40x25_text, /* Mode 01h */ // 16 color &VideoMode_80x25_text, /* Mode 02h */ // 16 color (mono) &VideoMode_80x25_text, /* Mode 03h */ // 16 color - &VideoMode_320x200_4color, /* Mode 04h */ + &VideoMode_320x200_4color, /* Mode 04h */ // 4 color &VideoMode_320x200_4color, /* Mode 05h */ // same (m) &VideoMode_640x200_2color, /* Mode 06h */ // 640*200 2 color NULL, /* Mode 07h */ // MDA monochrome text 80*25 @@ -274,8 +274,8 @@ NULL, /* Mode 0Fh */ // EGA 640*350 mono &VideoMode_640x350_16color, /* Mode 10h */ // EGA 640*350 16 color &VideoMode_640x480_2color, /* Mode 11h */ // VGA 640*480 mono - &VideoMode_640x480_16color, /* Mode 12h */ - &VideoMode_320x200_256color, /* Mode 13h */ + &VideoMode_640x480_16color, /* Mode 12h */ // VGA + &VideoMode_320x200_256color, /* Mode 13h */ // VGA }; /* PRIVATE FUNCTIONS **********************************************************/ @@ -385,7 +385,7 @@ if (Registers == NULL) return FALSE; - /* Clear interrupts */ + /* Disable interrupts */ setIF(0); /* @@ -453,7 +453,7 @@ VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state VgaWritePort(VGA_AC_INDEX, 0x20); - /* Set interrupts */ + /* Enable interrupts */ setIF(1); return TRUE; @@ -702,7 +702,7 @@ else { /* No key available. Set the handler CF to repeat the BOP */ - EmulatorSetFlag(EMULATOR_FLAG_CF); + setCF(1); // CharacterData = 0xFFFF; } @@ -1079,6 +1079,9 @@ /* Write the data */ VgaWritePort(VGA_AC_WRITE, getBH()); + /* Enable screen and disable palette access */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + VgaWritePort(VGA_AC_INDEX, 0x20); break; } @@ -1092,6 +1095,9 @@ /* Write the data */ VgaWritePort(VGA_AC_WRITE, getBH()); + /* Enable screen and disable palette access */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + VgaWritePort(VGA_AC_INDEX, 0x20); break; } @@ -1116,6 +1122,9 @@ VgaWritePort(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); VgaWritePort(VGA_AC_WRITE, Buffer[VGA_AC_PAL_F_REG + 1]); + /* Enable screen and disable palette access */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + VgaWritePort(VGA_AC_INDEX, 0x20); break; } @@ -1129,6 +1138,9 @@ /* Read the data */ setBH(VgaReadPort(VGA_AC_READ)); + /* Enable screen and disable palette access */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + VgaWritePort(VGA_AC_INDEX, 0x20); break; } @@ -1142,6 +1154,9 @@ /* Read the data */ setBH(VgaReadPort(VGA_AC_READ)); + /* Enable screen and disable palette access */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + VgaWritePort(VGA_AC_INDEX, 0x20); break; } @@ -1166,6 +1181,9 @@ VgaWritePort(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); Buffer[VGA_AC_PAL_F_REG + 1] = VgaReadPort(VGA_AC_READ); + /* Enable screen and disable palette access */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + VgaWritePort(VGA_AC_INDEX, 0x20); break; } Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Thu Dec 12 20:09:24 2013 @@ -111,7 +111,7 @@ NULL /* TODO: Use a TLB */); /* Enable interrupts */ - EmulatorSetFlag(EMULATOR_FLAG_IF); + setIF(1); return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/registers.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/register… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/registers.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/registers.c [iso-8859-1] Thu Dec 12 20:09:24 2013 @@ -15,17 +15,17 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -BOOLEAN EmulatorGetFlag(ULONG Flag) +static inline BOOLEAN EmulatorGetFlag(ULONG Flag) { return (EmulatorContext.Flags.Long & Flag) ? TRUE : FALSE; } -VOID EmulatorSetFlag(ULONG Flag) +static inline VOID EmulatorSetFlag(ULONG Flag) { EmulatorContext.Flags.Long |= Flag; } -VOID EmulatorClearFlag(ULONG Flag) +static inline VOID EmulatorClearFlag(ULONG Flag) { EmulatorContext.Flags.Long &= ~Flag; } Modified: branches/ntvdm/subsystems/ntvdm/registers.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/register… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/registers.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/registers.h [iso-8859-1] Thu Dec 12 20:09:24 2013 @@ -11,9 +11,6 @@ /* INCLUDES *******************************************************************/ -BOOLEAN EmulatorGetFlag(ULONG Flag); -VOID EmulatorSetFlag(ULONG Flag); -VOID EmulatorClearFlag(ULONG Flag); VOID EmulatorSetStack(WORD Segment, DWORD Offset);

1 0

[dgorbachev] 61262: Update FreeLdr linker script file. Remove unused files.
by dgorbachev＠svn.reactos.org 12 Dec '13

12 Dec '13

Author: dgorbachev Date: Thu Dec 12 16:52:49 2013 New Revision: 61262 URL: http://svn.reactos.org/svn/reactos?rev=61262&view=rev Log: Update FreeLdr linker script file. Remove unused files. Removed: trunk/reactos/boot/freeldr/freeldr/freeldr_amd64.lds trunk/reactos/boot/freeldr/freeldr/freeldr_arm.lds trunk/reactos/global.lds trunk/reactos/ntoskrnl/ntoskrnl_amd64.lds trunk/reactos/ntoskrnl/ntoskrnl_arm.lds trunk/reactos/ntoskrnl/ntoskrnl_i386.lds trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lds Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lds Removed: trunk/reactos/boot/freeldr/freeldr/freeldr_amd64.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_amd64.lds [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_amd64.lds (removed) @@ -1,57 +0,0 @@ -OUTPUT_FORMAT(pei-x86-64) -ENTRY(_mainCRTStartup) -SECTIONS -{ - .text __image_base__ + __section_alignment__ : - { - __text_start__ = .; - *(.init) - *(.text) - *(SORT(.text$*)) - *(.glue_7t) - *(.glue_7) - ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1); *(.ctors); *(.ctor); LONG (0); - ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1); *(.dtors); *(.dtor); LONG (0); - *(.fini) - /* ??? Why is .gcc_exc here? */ - *(.gcc_exc) - __text_end__ = .; - *(.gcc_except_table) - } - init BLOCK(__section_alignment__) : - { - __init_start__ = . ; - *(init) - __init_end__ = . ; - } - .data BLOCK(__section_alignment__) : - { - __data_start__ = . ; - *(.data) - *(.data2) - *(SORT(.data$*)) - __data_end__ = . ; - __bss_start__ = . ; - *(.bss) - *(COMMON) - __bss_end__ = . ; - } - .rdata BLOCK(__section_alignment__) : - { - *(.rdata) - *(SORT(.rdata$*)) - *(.eh_frame) - } - .stab BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stab ] - } - .stabstr BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stabstr ] - } - -} - Removed: trunk/reactos/boot/freeldr/freeldr/freeldr_arm.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arm.lds [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arm.lds (removed) @@ -1,54 +0,0 @@ -OUTPUT_FORMAT(pei-arm-wince-little) -SECTIONS -{ - .text __image_base__ + __section_alignment__ : - { - __text_start__ = .; - *(.init) - *(.text) - *(SORT(.text$*)) - *(.glue_7t) - *(.glue_7) - ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1); *(.ctors); *(.ctor); LONG (0); - ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1); *(.dtors); *(.dtor); LONG (0); - *(.fini) - /* ??? Why is .gcc_exc here? */ - *(.gcc_exc) - __text_end__ = .; - *(.gcc_except_table) - } - init BLOCK(__section_alignment__) : - { - __init_start__ = . ; - *(init) - __init_end__ = . ; - } - .data BLOCK(__section_alignment__) : - { - __data_start__ = . ; - *(.data) - *(.data2) - *(SORT(.data$*)) - __data_end__ = . ; - __bss_start__ = . ; - *(.bss) - *(COMMON) - __bss_end__ = . ; - } - .rdata BLOCK(__section_alignment__) : - { - *(.rdata) - *(SORT(.rdata$*)) - *(.eh_frame) - } - /DISCARD/ : - { - [ .stab ] - [ .stabstr ] - *(.reloc) - } - -} - Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lds [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lds [iso-8859-1] Thu Dec 12 16:52:49 2013 @@ -23,15 +23,6 @@ __bss_end__ = . ; } - .stab BLOCK(__section_alignment__) (NOLOAD) : - { - *(.stab) - } - .stabstr BLOCK(__section_alignment__) (NOLOAD) : - { - *(.stabstr) - } - /* DWARF debug sections. Symbols in the DWARF debugging sections are relative to the beginning of the section. Unlike other targets that fake this by putting the @@ -41,73 +32,141 @@ { *(.debug_aranges) } + .zdebug_aranges BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_aranges) + } .debug_pubnames BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_pubnames) } + .zdebug_pubnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_pubnames) + } .debug_pubtypes BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_pubtypes) + } + .zdebug_pubtypes BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_pubtypes) } /* DWARF 2. */ .debug_info BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_info .gnu.linkonce.wi.*) } + .zdebug_info BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_info .zdebug.gnu.linkonce.wi.*) + } .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_abbrev) + } + .zdebug_abbrev BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_abbrev) } .debug_line BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_line) } + .zdebug_line BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_line) + } .debug_frame BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_frame*) + } + .zdebug_frame BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_frame*) } .debug_str BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_str) } + .zdebug_str BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_str) + } .debug_loc BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_loc) } + .zdebug_loc BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_loc) + } .debug_macinfo BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_macinfo) + } + .zdebug_macinfo BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_macinfo) } /* SGI/MIPS DWARF 2 extensions. */ .debug_weaknames BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_weaknames) } + .zdebug_weaknames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_weaknames) + } .debug_funcnames BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_funcnames) + } + .zdebug_funcnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_funcnames) } .debug_typenames BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_typenames) } + .zdebug_typenames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_typenames) + } .debug_varnames BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_varnames) } + .zdebug_varnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_varnames) + } .debug_macro BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_macro) + } + .zdebug_macro BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_macro) } /* DWARF 3. */ .debug_ranges BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_ranges) } + .zdebug_ranges BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_ranges) + } /* DWARF 4. */ .debug_types BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_types .gnu.linkonce.wt.*) + } + .zdebug_types BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_types .gnu.linkonce.wt.*) } /DISCARD/ : Removed: trunk/reactos/global.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/global.lds?rev=61261 ============================================================================== --- trunk/reactos/global.lds [iso-8859-1] (original) +++ trunk/reactos/global.lds (removed) @@ -1,103 +0,0 @@ -OUTPUT_FORMAT(pei-i386) -SECTIONS -{ - .text __image_base__ + __section_alignment__ : - { - __text_start__ = .; - *(.init) - *(.text) - *(SORT(.text$*)) - *(.glue_7t) - *(.glue_7) - *(.jcr) - ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1);*(.ctors); *(.ctor); *(SORT(.ctors.*)); LONG (0); - ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1);*(.dtors); *(.dtor); *(SORT(.dtors.*)); LONG (0); - *(.fini) - *(.gcc_exc) - __text_end__ = .; - *(.gcc_except_table) - } - init BLOCK(__section_alignment__) : - { - __init_start__ = . ; - *(init) - __init_end__ = . ; - } - .data BLOCK(__section_alignment__) : - { - __data_start__ = . ; - *(.data) - *(.data2) - *(SORT(.data$*)) - __data_end__ = . ; - __bss_start__ = . ; - *(.bss) - *(COMMON) - __bss_end__ = . ; - *(SORT(.CRT$*)) - } - .rdata BLOCK(__section_alignment__) : - { - *(.rdata) - *(SORT(.rdata$*)) - *(.eh_frame) - } - .edata BLOCK(__section_alignment__) : { *(.edata) } - .idata BLOCK(__section_alignment__) : - { - /* This cannot currently be handled with grouped sections. - See pe.em:sort_sections. */ - SORT(*)(.idata$2) - SORT(*)(.idata$3) - /* These zeroes mark the end of the import list. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - SORT(*)(.idata$4) - SORT(*)(.idata$5) - SORT(*)(.idata$6) - SORT(*)(.idata$7) - } - .tls BLOCK(__section_alignment__) : - { - *(.tls) - *(.tls$) - *(SORT(.tls$*)) - } - /DISCARD/ : - { - *(.debug$S) - *(.debug$T) - *(.debug$F) - *(.drectve) - *(.debug_loc) - *(.debug_ranges) - *(.debug_aranges) - *(.debug_str) - *(.debug_frame) - *(.debug_pubnames) - *(.debug_pubtypes) - *(.gnu.linkonce.wt.*) - } - .rsrc BLOCK(__section_alignment__) : - { - *(.rsrc) - *(SORT(.rsrc$*)) - } - .reloc BLOCK(__section_alignment__) : - { - *(.reloc) - } - .debug_info BLOCK(__section_alignment__) (NOLOAD) : - { - [ .debug_info ] - } - .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : - { - [ .debug_abbrev ] - } - .debug_line BLOCK(__section_alignment__) (NOLOAD) : - { - [ .debug_line ] - } -} Removed: trunk/reactos/ntoskrnl/ntoskrnl_amd64.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_amd64.ld… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_amd64.lds [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_amd64.lds (removed) @@ -1,174 +0,0 @@ -OUTPUT_FORMAT(pei-x86-64) -ENTRY(_mainCRTStartup) -SECTIONS -{ - .text __image_base__ + __section_alignment__ : - { - __text_start__ = .; - *(.init) - *(.text) - *(SORT(.text$*)) - *(.glue_7t) - *(.glue_7) - ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1); *(.ctors); *(.ctor); LONG (0); - ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1); *(.dtors); *(.dtor); LONG (0); - *(.fini) - /* ??? Why is .gcc_exc here? */ - *(.gcc_exc) - __text_end__ = .; - *(.gcc_except_table) - } - init BLOCK(__section_alignment__) : - { - __init_start__ = . ; - *(init) - __init_end__ = . ; - } - /* The Cygwin32 library uses a section to avoid copying certain data - on fork. This used to be named ".data". The linker used - to include this between __data_start__ and __data_end__, but that - breaks building the cygwin32 dll. Instead, we name the section - ".data_cygwin_nocopy" and explictly include it after __data_end__. */ - .data BLOCK(__section_alignment__) : - { - __data_start__ = . ; - *(.data) - *(.data2) - *(SORT(.data$*)) - __data_end__ = . ; - *(.data_cygwin_nocopy) - } - .rdata BLOCK(__section_alignment__) : - { - *(.rdata) - *(SORT(.rdata$*)) - /* For some reason mingw likes to merge it here. I don't! */ - /* *(.eh_frame) */ - } - .edata BLOCK(__section_alignment__) : - { - *(.edata) - } - /DISCARD/ : - { - *(.debug$S) - *(.debug$T) - *(.debug$F) - *(.drectve) - } - - .idata BLOCK(__section_alignment__) : - { - /* This cannot currently be handled with grouped sections. - See pe.em:sort_sections. */ - SORT(*)(.idata$2) - SORT(*)(.idata$3) - /* These zeroes mark the end of the import list. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - SORT(*)(.idata$4) - SORT(*)(.idata$5) - SORT(*)(.idata$6) - SORT(*)(.idata$7) - } - .CRT BLOCK(__section_alignment__) : - { - *(SORT(.CRT$*)) - } - .rsrc BLOCK(__section_alignment__) : - { - *(.rsrc) - *(SORT(.rsrc$*)) - } - .bss BLOCK(__section_alignment__) : - { - __bss_start__ = . ; - *(.bss) - *(COMMON) - __bss_end__ = . ; - } - .reloc BLOCK(__section_alignment__) : - { - *(.reloc) - /* These zeroes mark the end of the reloc section. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - } - .stab BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stab ] - } - .stabstr BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stabstr ] - } - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section. Unlike other targets that fake this by putting the - section VMA at 0, the PE format will not allow it. */ - /* DWARF 1.1 and DWARF 2. */ - .debug_aranges BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_aranges) - } - .debug_pubnames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_pubnames) - } - /* DWARF 2. */ - .debug_info BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_info) *(.gnu.linkonce.wi.*) - } - .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_abbrev) - } - .debug_line BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_line) - } - .debug_frame BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_frame) - } - .debug_str BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_str) - } - .debug_loc BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_loc) - } - .debug_macinfo BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_macinfo) - } - /* SGI/MIPS DWARF 2 extensions. */ - .debug_weaknames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_weaknames) - } - .debug_funcnames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_funcnames) - } - .debug_typenames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_typenames) - } - .debug_varnames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_varnames) - } - /* DWARF 3. */ - .debug_ranges BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_ranges) - } - .eh_frame BLOCK(__section_alignment__) : - { - *(.eh_frame) - } -} - Removed: trunk/reactos/ntoskrnl/ntoskrnl_arm.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_arm.lds?… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_arm.lds [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_arm.lds (removed) @@ -1,105 +0,0 @@ -OUTPUT_FORMAT(pei-arm-wince-little) -ENTRY(_mainCRTStartup) -SECTIONS -{ - .text __image_base__ + __section_alignment__ : - { - __text_start__ = .; - *(.init) - *(.text) - *(SORT(.text$*)) - *(.glue_7t) - *(.glue_7) - ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1); *(.ctors); *(.ctor); LONG (0); - ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1); *(.dtors); *(.dtor); LONG (0); - *(.fini) - /* ??? Why is .gcc_exc here? */ - *(.gcc_exc) - __text_end__ = .; - *(.gcc_except_table) - } - init BLOCK(__section_alignment__) : - { - __init_start__ = . ; - *(init) - __init_end__ = . ; - } - /* The Cygwin32 library uses a section to avoid copying certain data - on fork. This used to be named ".data". The linker used - to include this between __data_start__ and __data_end__, but that - breaks building the cygwin32 dll. Instead, we name the section - ".data_cygwin_nocopy" and explictly include it after __data_end__. */ - .data BLOCK(__section_alignment__) : - { - __data_start__ = . ; - *(.data) - *(.data2) - *(SORT(.data$*)) - __data_end__ = . ; - *(.data_cygwin_nocopy) - } - .rdata BLOCK(__section_alignment__) : - { - *(.rdata) - *(SORT(.rdata$*)) - *(.eh_frame) - } - .edata BLOCK(__section_alignment__) : - { - *(.edata) - } - /DISCARD/ : - { - *(.debug$S) - *(.debug$T) - *(.debug$F) - *(.drectve) - } - - .idata BLOCK(__section_alignment__) : - { - /* This cannot currently be handled with grouped sections. - See pe.em:sort_sections. */ - SORT(*)(.idata$2) - SORT(*)(.idata$3) - /* These zeroes mark the end of the import list. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - SORT(*)(.idata$4) - SORT(*)(.idata$5) - SORT(*)(.idata$6) - SORT(*)(.idata$7) - } - .CRT BLOCK(__section_alignment__) : - { - *(SORT(.CRT$*)) - } - .rsrc BLOCK(__section_alignment__) : - { - *(.rsrc) - *(SORT(.rsrc$*)) - } - .bss BLOCK(__section_alignment__) : - { - __bss_start__ = . ; - *(.bss) - *(COMMON) - __bss_end__ = . ; - } - .reloc BLOCK(__section_alignment__) : - { - *(.reloc) - /* These zeroes mark the end of the reloc section. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - } - .stab BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stab ] - } - .stabstr BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stabstr ] - } -} - Removed: trunk/reactos/ntoskrnl/ntoskrnl_i386.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.lds… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.lds [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.lds (removed) @@ -1,150 +0,0 @@ -SECTIONS -{ - .text __image_base__ + __section_alignment__ : - { - *(.text) - *(SORT(.text*)) - } - - .data BLOCK(__section_alignment__) : - { - *(.data) - *(SORT(.data*)) - } - - .rdata BLOCK(__section_alignment__) : - { - *(.rdata) - *(SORT(.rdata*)) - *(.eh_frame) - } - - .edata BLOCK(__section_alignment__) : - { - *(.edata) - } - - /DISCARD/ : - { - *(.drectve) - *(.gnu.lto_*) - } - - .idata BLOCK(__section_alignment__) : - { - /* This cannot currently be handled with grouped sections. - See pe.em:sort_sections. */ - SORT(*)(.idata$2) - SORT(*)(.idata$3) - /* These zeroes mark the end of the import list. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - SORT(*)(.idata$4) - SORT(*)(.idata$5) - SORT(*)(.idata$6) - SORT(*)(.idata$7) - } - - .rsrc BLOCK(__section_alignment__) : - { - *(.rsrc) - *(SORT(.rsrc$*)) - } - - .bss BLOCK(__section_alignment__) : - { - *(.bss) - *(COMMON) - } - - .reloc BLOCK(__section_alignment__) : - { - *(.reloc) - } - - .stab BLOCK(__section_alignment__) (NOLOAD) : - { - *(.stab) - } - .stabstr BLOCK(__section_alignment__) (NOLOAD) : - { - *(.stabstr) - } - - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section. Unlike other targets that fake this by putting the - section VMA at 0, the PE format will not allow it. */ - /* DWARF 1.1 and DWARF 2. */ - .debug_aranges BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_aranges) - } - .debug_pubnames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_pubnames) - } - .debug_pubtypes BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_pubtypes) - } - /* DWARF 2. */ - .debug_info BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_info .gnu.linkonce.wi.*) - } - .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_abbrev) - } - .debug_line BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_line) - } - .debug_frame BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_frame*) - } - .debug_str BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_str) - } - .debug_loc BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_loc) - } - .debug_macinfo BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_macinfo) - } - /* SGI/MIPS DWARF 2 extensions. */ - .debug_weaknames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_weaknames) - } - .debug_funcnames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_funcnames) - } - .debug_typenames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_typenames) - } - .debug_varnames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_varnames) - } - .debug_macro BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_macro) - } - /* DWARF 3. */ - .debug_ranges BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_ranges) - } - /* DWARF 4. */ - .debug_types BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_types .gnu.linkonce.wt.*) - } -} Removed: trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_powerpc.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lds [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lds (removed) @@ -1,57 +0,0 @@ -/* Default linker script, for normal executables */ -OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", - "elf32-powerpc") -OUTPUT_ARCH(powerpc:common) -SECTIONS -{ - .text : - { - __text_start__ = .; - *(.text) - *(init) - *(INIT) - __text_end__ = .; - } - .data : - { - *(.data) - *(.data2) - *(.rdata) - *(.sdata) - *(.pdata) - } - .rodata : - { - *(.rodata*) - *(.got2) - *(.eh_frame) - } - .idata : - { - *(.idata$2) - SORT(*)(.idata$3) - LONG(0); LONG(0); LONG(0); LONG(0); LONG(0); - SORT(*)(.idata$4) - SORT(*)(.idata$5) - SORT(*)(.idata$6) - SORT(*)(.idata$7) - } - .edata : - { - *(.edata) - } - .bss : - { - *(.sbss) - *(.bss) - *(COMMON) - } - .rsrc : - { - *(.rsrc) - } - .rela : - { - *(.rela.*) - } -}

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