Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[tkreuzer] 50188: [CMAKE] - Fix set_entrypoint for other architectures than x86, add an optional 3rd parameter for stdcall stackbytes - don't add stdcall decoration to def files for other architect...
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 12:14:13 2010 New Revision: 50188 URL: http://svn.reactos.org/svn/reactos?rev=50188&view=rev Log: [CMAKE] - Fix set_entrypoint for other architectures than x86, add an optional 3rd parameter for stdcall stackbytes - don't add stdcall decoration to def files for other architectures then x86 Modified: branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=501… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Tue Dec 28 12:14:13 2010 @@ -45,6 +45,13 @@ add_definitions(-U_X86_ -UWIN32) endif() +# alternative arch name +if(ARCH MATCHES amd64) + set(ARCH2 x86_64) +else() + set(ARCH2 ${ARCH}) +endif() + # Macros macro(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename) # Add the precompiled header to the build @@ -56,7 +63,7 @@ get_directory_property(DIRINC INCLUDE_DIRECTORIES) foreach(item ${DIRINC}) list(APPEND ${_out_compile_flags} -I${item}) - endforeach() + endforeach() # This is a particular bit of undocumented/hacky magic I'm quite proud of get_directory_property(_compiler_flags DEFINITIONS) @@ -70,7 +77,7 @@ list(APPEND ${_out_compile_flags} -D${item}) endforeach() endif() -endmacro() +endmacro() macro(add_pch _target_name _header_filename _src_list) get_filename_component(FILE ${_header_filename} NAME) @@ -93,11 +100,17 @@ set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS}) endmacro() +# Optional 3rd parameter: stdcall stack bytes macro(set_entrypoint MODULE ENTRYPOINT) if(${ENTRYPOINT} STREQUAL "0") add_linkerflag(${MODULE} "-Wl,-entry,0") - else() + elseif(ARCH MATCHES i386) + if (${ARGC} GREATER 2) + set(ENTRYPOINT ${ENTRYPOINT}@${ARGV2}) + endif() add_linkerflag(${MODULE} "-Wl,-entry,_${ENTRYPOINT}") + else() + add_linkerflag(${MODULE} "-Wl,-entry,${ENTRYPOINT}") endif() endmacro() @@ -118,7 +131,7 @@ if(${TYPE} MATCHES nativecui) set_subsystem(${MODULE} native) - set_entrypoint(${MODULE} NtProcessStartup@4) + set_entrypoint(${MODULE} NtProcessStartup 4) elseif(${TYPE} MATCHES win32gui) set_subsystem(${MODULE} windows) set_entrypoint(${MODULE} WinMainCRTStartup) @@ -138,7 +151,7 @@ endif(NOT IS_UNICODE) target_link_libraries(${MODULE} mingw_common) elseif(${TYPE} MATCHES win32dll) - set_entrypoint(${MODULE} DllMainCRTStartup@12) + set_entrypoint(${MODULE} DllMainCRTStartup 12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) if(DEFINED baseaddress_${MODULE}) set_image_base(${MODULE} ${baseaddress_${MODULE}}) @@ -146,16 +159,16 @@ message(STATUS "${MODULE} has no base address") endif() elseif(${TYPE} MATCHES win32ocx) - set_entrypoint(${MODULE} DllMainCRTStartup@12) + set_entrypoint(${MODULE} DllMainCRTStartup 12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") elseif(${TYPE} MATCHES cpl) - set_entrypoint(${MODULE} DllMainCRTStartup@12) + set_entrypoint(${MODULE} DllMainCRTStartup 12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") elseif(${TYPE} MATCHES kernelmodedriver) set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000" SUFFIX ".sys") - set_entrypoint(${MODULE} DriverEntry@8) + set_entrypoint(${MODULE} DriverEntry 8) set_subsystem(${MODULE} native) set_image_base(${MODULE} 0x00010000) add_dependencies(${MODULE} bugcodes) @@ -221,13 +234,17 @@ else() set(DLLNAME_OPTION "") endif() - + + if(NOT ARCH MATCHES i386) + set(DECO_OPTION "-@") + endif() + add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a - COMMAND native-spec2def ${DLLNAME_OPTION} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} + COMMAND native-spec2def ${DLLNAME_OPTION} ${DECO_OPTION} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) - + elseif(${_extension} STREQUAL ".def") add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a @@ -236,7 +253,7 @@ else() message(FATAL_ERROR "Unsupported exports file extension: ${_extension}") endif() - + add_custom_target( lib${_name} DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a) @@ -247,7 +264,7 @@ get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c - COMMAND native-spec2def -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def -n=${_dllname} ${DECO_OPTION} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)

1 0

[akhaldi] 50187: [CMAKE] - Actually the ARCH initialization is needed in both places.
by akhaldi＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: akhaldi Date: Tue Dec 28 12:00:49 2010 New Revision: 50187 URL: http://svn.reactos.org/svn/reactos?rev=50187&view=rev Log: [CMAKE] - Actually the ARCH initialization is needed in both places. Modified: branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Tue Dec 28 12:00:49 2010 @@ -1,3 +1,7 @@ + +if(NOT ARCH) + set(ARCH i386) +endif() # Choose the right MinGW prefix if(ARCH MATCHES i386)

1 0

[akhaldi] 50186: [CMAKE] - Move the ARCH initialization to the main cmake file instead of the toolchain file.
by akhaldi＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: akhaldi Date: Tue Dec 28 11:50:56 2010 New Revision: 50186 URL: http://svn.reactos.org/svn/reactos?rev=50186&view=rev Log: [CMAKE] - Move the ARCH initialization to the main cmake file instead of the toolchain file. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Tue Dec 28 11:50:56 2010 @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 2.8) project(REACTOS) + +if(NOT ARCH) + set(ARCH i386) +endif() # Compile options if(ARCH MATCHES i386) Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Tue Dec 28 11:50:56 2010 @@ -1,7 +1,3 @@ - -if(NOT ARCH) - set(ARCH i386) -endif() # Choose the right MinGW prefix if(ARCH MATCHES i386)

1 0

[jimtabor] 50185: [Win32k] - Fix all the user32 wine win test_CreateWindow tests.
by jimtabor＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: jimtabor Date: Tue Dec 28 10:38:38 2010 New Revision: 50185 URL: http://svn.reactos.org/svn/reactos?rev=50185&view=rev Log: [Win32k] - Fix all the user32 wine win test_CreateWindow tests. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Dec 28 10:38:38 2010 @@ -437,8 +437,9 @@ TIMER_RemoveWindowTimers(Window->head.h); #endif - if (!(Window->style & WS_CHILD) && Window->IDMenu - && (Menu = UserGetMenuObject((HMENU)Window->IDMenu))) + if ( ((Window->style & (WS_CHILD|WS_POPUP)) != WS_CHILD) && + Window->IDMenu && + (Menu = UserGetMenuObject((HMENU)Window->IDMenu))) { IntDestroyMenuObject(Menu, TRUE, TRUE); Window->IDMenu = 0;

1 0

[tkreuzer] 50184: [SPEC2DEF] Fix architecture option
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 10:09:07 2010 New Revision: 50184 URL: http://svn.reactos.org/svn/reactos?rev=50184&view=rev Log: [SPEC2DEF] Fix architecture option Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Tue Dec 28 10:09:07 2010 @@ -680,7 +680,7 @@ { no_redirections = 1; } - else if (argv[i][1] == 'a' && argv[i][1] == '=') + else if (argv[i][1] == 'a' && argv[i][2] == '=') { pszArchString = argv[i] + 3; }

1 0

[jimtabor] 50183: [User32] - Fix all the user32 wine win test_parent_owner tests.
by jimtabor＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: jimtabor Date: Tue Dec 28 10:03:07 2010 New Revision: 50183 URL: http://svn.reactos.org/svn/reactos?rev=50183&view=rev Log: [User32] - Fix all the user32 wine win test_parent_owner tests. Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Tue Dec 28 10:03:07 2010 @@ -651,6 +651,14 @@ if (pHwnd) HeapFree(hHeap, 0, pHwnd); return FALSE; + } + + if (!dwCount) + { + if (!dwThreadId) + return FALSE; + else + return TRUE; } /* call the user's callback function until we're done or

1 0

[tkreuzer] 50182: [CMAKE] Fix configure script for host tools
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 09:17:42 2010 New Revision: 50182 URL: http://svn.reactos.org/svn/reactos?rev=50182&view=rev Log: [CMAKE] Fix configure script for host tools Modified: branches/cmake-bringup/configure.cmd Modified: branches/cmake-bringup/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/configure.cmd?rev… ============================================================================== --- branches/cmake-bringup/configure.cmd [iso-8859-1] (original) +++ branches/cmake-bringup/configure.cmd [iso-8859-1] Tue Dec 28 09:17:42 2010 @@ -22,10 +22,10 @@ cd host-tools set REACTOS_BUILD_TOOLS_DIR=%CD% if "%BUILD_ENVIRONMENT%" == "MINGW" ( - cmake -G "MinGW Makefiles" %ROS_SOURCE_DIR% + cmake -G "MinGW Makefiles" -DARCH=%ROS_ARCH% %ROS_SOURCE_DIR% ) if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G "NMake Makefiles" %ROS_SOURCE_DIR% + cmake -G "NMake Makefiles" -DARCH=%_BUILDARCH% %ROS_SOURCE_DIR% ) cd..

1 0

[jimtabor] 50181: [Win32k|User32] - Fix all the user32 wine win test_SetParent tests.
by jimtabor＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: jimtabor Date: Tue Dec 28 07:22:42 2010 New Revision: 50181 URL: http://svn.reactos.org/svn/reactos?rev=50181&view=rev Log: [Win32k|User32] - Fix all the user32 wine win test_SetParent tests. Modified: trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Tue Dec 28 07:22:42 2010 @@ -1450,14 +1450,11 @@ _SEH2_TRY { - while (Wnd != NULL) + while (Wnd != NULL && ((Wnd->style & (WS_POPUP|WS_CHILD)) == WS_CHILD)) { if (Wnd->spwndParent != NULL) { Wnd = DesktopPtrToUser(Wnd->spwndParent); - - if(Wnd == DesktopWnd) - Wnd = NULL; if (Wnd == WndParent) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Dec 28 07:22:42 2010 @@ -899,15 +899,11 @@ PWND Window; Window = BaseWindow; - while (Window) + while (Window && ((Window->style & (WS_POPUP|WS_CHILD)) == WS_CHILD)) { if (Window == Parent) { return(TRUE); - } - if(!(Window->style & WS_CHILD)) - { - break; } Window = Window->spwndParent; @@ -1090,7 +1086,7 @@ PWND FASTCALL co_IntSetParent(PWND Wnd, PWND WndNewParent) { - PWND WndOldParent; + PWND WndOldParent, pWndExam; BOOL WasVisible; ASSERT(Wnd); @@ -1098,11 +1094,29 @@ ASSERT_REFS_CO(Wnd); ASSERT_REFS_CO(WndNewParent); + if (Wnd == Wnd->head.rpdesk->spwndMessage) + { + EngSetLastError(ERROR_ACCESS_DENIED); + return( NULL); + } + /* Some applications try to set a child as a parent */ if (IntIsChildWindow(Wnd, WndNewParent)) { EngSetLastError( ERROR_INVALID_PARAMETER ); return NULL; + } + + pWndExam = WndNewParent; // Load parent Window to examine. + // Now test for set parent to parent hit. + while (pWndExam) + { + if (Wnd == pWndExam) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + pWndExam = pWndExam->spwndParent; } /* @@ -1148,6 +1162,62 @@ */ return WndOldParent; +} + +HWND FASTCALL +co_UserSetParent(HWND hWndChild, HWND hWndNewParent) +{ + PWND Wnd = NULL, WndParent = NULL, WndOldParent; + HWND hWndOldParent = NULL; + USER_REFERENCE_ENTRY Ref, ParentRef; + + if (IntIsBroadcastHwnd(hWndChild) || IntIsBroadcastHwnd(hWndNewParent)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return( NULL); + } + + if (hWndChild == IntGetDesktopWindow()) + { + EngSetLastError(ERROR_ACCESS_DENIED); + return( NULL); + } + + if (hWndNewParent) + { + if (!(WndParent = UserGetWindowObject(hWndNewParent))) + { + return( NULL); + } + } + else + { + if (!(WndParent = UserGetWindowObject(IntGetDesktopWindow()))) + { + return( NULL); + } + } + + if (!(Wnd = UserGetWindowObject(hWndChild))) + { + return( NULL); + } + + UserRefObjectCo(Wnd, &Ref); + UserRefObjectCo(WndParent, &ParentRef); + + WndOldParent = co_IntSetParent(Wnd, WndParent); + + UserDerefObjectCo(WndParent); + UserDerefObjectCo(Wnd); + + if (WndOldParent) + { + hWndOldParent = WndOldParent->head.h; + UserDereferenceObject(WndOldParent); + } + + return( hWndOldParent); } BOOL FASTCALL @@ -3055,63 +3125,6 @@ DPRINT("Leave NtUserGetListBoxInfo, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; -} - - -HWND FASTCALL -co_UserSetParent(HWND hWndChild, HWND hWndNewParent) -{ - PWND Wnd = NULL, WndParent = NULL, WndOldParent; - HWND hWndOldParent = NULL; - USER_REFERENCE_ENTRY Ref, ParentRef; - - if (IntIsBroadcastHwnd(hWndChild) || IntIsBroadcastHwnd(hWndNewParent)) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return( NULL); - } - - if (hWndChild == IntGetDesktopWindow()) - { - EngSetLastError(ERROR_ACCESS_DENIED); - return( NULL); - } - - if (hWndNewParent) - { - if (!(WndParent = UserGetWindowObject(hWndNewParent))) - { - return( NULL); - } - } - else - { - if (!(WndParent = UserGetWindowObject(IntGetDesktopWindow()))) - { - return( NULL); - } - } - - if (!(Wnd = UserGetWindowObject(hWndChild))) - { - return( NULL); - } - - UserRefObjectCo(Wnd, &Ref); - UserRefObjectCo(WndParent, &ParentRef); - - WndOldParent = co_IntSetParent(Wnd, WndParent); - - UserDerefObjectCo(WndParent); - UserDerefObjectCo(Wnd); - - if (WndOldParent) - { - hWndOldParent = WndOldParent->head.h; - UserDereferenceObject(WndOldParent); - } - - return( hWndOldParent); } /*

1 0

[tkreuzer] 50180: [CMAKE] Fix genincdata for amd64
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 01:06:06 2010 New Revision: 50180 URL: http://svn.reactos.org/svn/reactos?rev=50180&view=rev Log: [CMAKE] Fix genincdata for amd64 Modified: branches/cmake-bringup/include/asm/genincdata.c branches/cmake-bringup/include/asm/ksamd64.template.h branches/cmake-bringup/include/asm/ksx.template.h Modified: branches/cmake-bringup/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/genin… ============================================================================== --- branches/cmake-bringup/include/asm/genincdata.c [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/genincdata.c [iso-8859-1] Tue Dec 28 01:06:06 2010 @@ -3,6 +3,7 @@ /* DDK/IFS/NDK Headers */ #include <excpt.h> +#include <setjmp.h> #include <ntdef.h> #include <ntifs.h> #include <arc/arc.h> @@ -60,6 +61,7 @@ #else #error Your compiler is not supported. #endif + ASMGENDATA Table[] = { Modified: branches/cmake-bringup/include/asm/ksamd64.template.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ksamd… ============================================================================== --- branches/cmake-bringup/include/asm/ksamd64.template.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/ksamd64.template.h [iso-8859-1] Tue Dec 28 01:06:06 2010 @@ -1,4 +1,3 @@ - HEADER("CR0 flags"), CONSTANT(CR0_PE), @@ -39,7 +38,6 @@ CONSTANT(MACHINE_TYPE_EISA), CONSTANT(MACHINE_TYPE_MCA), -#endif HEADER("EFLAGS"), CONSTANT(EFLAGS_TF_MASK), CONSTANT(EFLAGS_TF_SHIFT), @@ -48,14 +46,14 @@ CONSTANT(EFLAGS_ID_MASK), HEADER("Hypervisor Enlightenment Definitions"), -CONSTANT(HV_MMU_USE_HYPERCALL_FOR_ADDRESS_SWITCH), -CONSTANT(HV_MMU_USE_HYPERCALL_FOR_LOCAL_FLUSH), -CONSTANT(HV_MMU_USE_HYPERCALL_FOR_REMOTE_FLUSH), -CONSTANT(HV_X64_MSR_APIC_EOI), -CONSTANT(HV_APIC_ENLIGHTENED), -CONSTANT(HV_KE_USE_HYPERCALL_FOR_LONG_SPIN_WAIT), -CONSTANT(HV_VIRTUAL_APIC_NO_EOI_REQUIRED_V), -CONSTANT(HvApicFlags), +//CONSTANT(HV_MMU_USE_HYPERCALL_FOR_ADDRESS_SWITCH), +//CONSTANT(HV_MMU_USE_HYPERCALL_FOR_LOCAL_FLUSH), +//CONSTANT(HV_MMU_USE_HYPERCALL_FOR_REMOTE_FLUSH), +//CONSTANT(HV_X64_MSR_APIC_EOI), +//CONSTANT(HV_APIC_ENLIGHTENED), +//CONSTANT(HV_KE_USE_HYPERCALL_FOR_LONG_SPIN_WAIT), +//CONSTANT(HV_VIRTUAL_APIC_NO_EOI_REQUIRED_V), +//CONSTANT(HvApicFlags), HEADER("KDGT selectors"), CONSTANT(KGDT64_NULL), @@ -92,10 +90,9 @@ CONSTANT(MSR_LAST_EXCEPTION_TO), HEADER("Flags for MSR_DEGUG_CTL"), -CONSTANT(MSR_DEBUG_CTL_LBR), -CONSTANT(MSR_DEBUG_CRL_BTF), - -#if 0 +//CONSTANT(MSR_DEBUG_CTL_LBR), +//CONSTANT(MSR_DEBUG_CRL_BTF), + HEADER("Fatal exception codes"), CONSTANT(EXCEPTION_DIVIDED_BY_ZERO), CONSTANT(EXCEPTION_DEBUG), @@ -113,7 +110,6 @@ CONSTANT(EXCEPTION_RESERVED_TRAP), CONSTANT(EXCEPTION_NPX_ERROR), CONSTANT(EXCEPTION_ALIGNMENT_CHECK), -#endif HEADER("Argument Home Address"), OFFSET(P1Home, CONTEXT, P1Home), @@ -187,16 +183,16 @@ SIZE(CONTEXT_FRAME_LENGTH, CONTEXT), HEADER("DISPATCHER_CONTEXT"), -OFFSET(DcControlPc, TYPE, ControlPc), -OFFSET(DcImageBase, TYPE, ImageBase), -OFFSET(DcFunctionEntry, TYPE, FunctionEntry), -OFFSET(DcEstablisherFrame, TYPE, EstablisherFrame), -OFFSET(DcTargetIp, TYPE, TargetIp), -OFFSET(DcContextRecord, TYPE, ContextRecord), -OFFSET(DcLanguageHandler, TYPE, LanguageHandler), -OFFSET(DcHandlerData, TYPE, HandlerData), -OFFSET(DcHistoryTable, TYPE, HistoryTable), -OFFSET(DcScopeIndex, TYPE, ScopeIndex), +OFFSET(DcControlPc, DISPATCHER_CONTEXT, ControlPc), +OFFSET(DcImageBase, DISPATCHER_CONTEXT, ImageBase), +OFFSET(DcFunctionEntry, DISPATCHER_CONTEXT, FunctionEntry), +OFFSET(DcEstablisherFrame, DISPATCHER_CONTEXT, EstablisherFrame), +OFFSET(DcTargetIp, DISPATCHER_CONTEXT, TargetIp), +OFFSET(DcContextRecord, DISPATCHER_CONTEXT, ContextRecord), +OFFSET(DcLanguageHandler, DISPATCHER_CONTEXT, LanguageHandler), +OFFSET(DcHandlerData, DISPATCHER_CONTEXT, HandlerData), +OFFSET(DcHistoryTable, DISPATCHER_CONTEXT, HistoryTable), +OFFSET(DcScopeIndex, DISPATCHER_CONTEXT, ScopeIndex), HEADER("KEXCEPTION_FRAME"), OFFSET(ExP1Home, KEXCEPTION_FRAME, P1Home), @@ -232,38 +228,38 @@ SIZE(KEXCEPTION_FRAME_LENGTH, KEXCEPTION_FRAME), HEADER("JUMP_BUFFER"), -OFFSET(JbFrame, JUMP_BUFFER, Frame), -OFFSET(JbRbx, JUMP_BUFFER, Rbx), -OFFSET(JbRsp, JUMP_BUFFER, Rsp), -OFFSET(JbRbp, JUMP_BUFFER, Rbp), -OFFSET(JbRsi, JUMP_BUFFER, Rsi), -OFFSET(JbRdi, JUMP_BUFFER, Rdi), -OFFSET(JbR12, JUMP_BUFFER, R12), -OFFSET(JbR13, JUMP_BUFFER, R13), -OFFSET(JbR14, JUMP_BUFFER, R14), -OFFSET(JbR15, JUMP_BUFFER, R15), -OFFSET(JbRip, JUMP_BUFFER, Rip), -OFFSET(JbMxCsr, JUMP_BUFFER, MxCsr), -OFFSET(JbFpCsr, JUMP_BUFFER, FpCsr), -OFFSET(JbXmm6, JUMP_BUFFER, Xmm6), -OFFSET(JbXmm7, JUMP_BUFFER, Xmm7), -OFFSET(JbXmm8, JUMP_BUFFER, Xmm8), -OFFSET(JbXmm9, JUMP_BUFFER, Xmm9), -OFFSET(JbXmm10, JUMP_BUFFER, Xmm10), -OFFSET(JbXmm11, JUMP_BUFFER, Xmm11), -OFFSET(JbXmm12, JUMP_BUFFER, Xmm12), -OFFSET(JbXmm13, JUMP_BUFFER, Xmm13), -OFFSET(JbXmm14, JUMP_BUFFER, Xmm14), -OFFSET(JbXmm15, JUMP_BUFFER, Xmm15), - -HEADER("KGDT64"), -OFFSET(KgdtBaseLow, KGDT64, BaseLow), -OFFSET(KgdtBaseMiddle, KGDT64, BaseMiddle), -OFFSET(KgdtBaseHigh, KGDT64, BaseHigh), -OFFSET(KgdtBaseUpper, KGDT64, BaseUpper), -OFFSET(KgdtLimitHigh, KGDT64, LimitHigh), -OFFSET(KgdtLimitLow, KGDT64, LimitLow), -CONSTANT(KGDT_LIMIT_ENCODE_MASK), +OFFSET(JbFrame, _JUMP_BUFFER, Frame), +OFFSET(JbRbx, _JUMP_BUFFER, Rbx), +OFFSET(JbRsp, _JUMP_BUFFER, Rsp), +OFFSET(JbRbp, _JUMP_BUFFER, Rbp), +OFFSET(JbRsi, _JUMP_BUFFER, Rsi), +OFFSET(JbRdi, _JUMP_BUFFER, Rdi), +OFFSET(JbR12, _JUMP_BUFFER, R12), +OFFSET(JbR13, _JUMP_BUFFER, R13), +OFFSET(JbR14, _JUMP_BUFFER, R14), +OFFSET(JbR15, _JUMP_BUFFER, R15), +OFFSET(JbRip, _JUMP_BUFFER, Rip), +//OFFSET(JbMxCsr, _JUMP_BUFFER, MxCsr), // Spare +//OFFSET(JbFpCsr, _JUMP_BUFFER, FpCsr), +OFFSET(JbXmm6, _JUMP_BUFFER, Xmm6), +OFFSET(JbXmm7, _JUMP_BUFFER, Xmm7), +OFFSET(JbXmm8, _JUMP_BUFFER, Xmm8), +OFFSET(JbXmm9, _JUMP_BUFFER, Xmm9), +OFFSET(JbXmm10, _JUMP_BUFFER, Xmm10), +OFFSET(JbXmm11, _JUMP_BUFFER, Xmm11), +OFFSET(JbXmm12, _JUMP_BUFFER, Xmm12), +OFFSET(JbXmm13, _JUMP_BUFFER, Xmm13), +OFFSET(JbXmm14, _JUMP_BUFFER, Xmm14), +OFFSET(JbXmm15, _JUMP_BUFFER, Xmm15), + +HEADER("KGDTENTRY64"), +OFFSET(KgdtBaseLow, KGDTENTRY64, BaseLow), +OFFSET(KgdtBaseMiddle, KGDTENTRY64, Bytes.BaseMiddle), +OFFSET(KgdtBaseHigh, KGDTENTRY64, Bytes.BaseHigh), +OFFSET(KgdtBaseUpper, KGDTENTRY64, BaseUpper), +OFFSET(KgdtLimitHigh, KGDTENTRY64, Bytes.Flags2), +OFFSET(KgdtLimitLow, KGDTENTRY64, LimitLow), +//CONSTANT(KGDT_LIMIT_ENCODE_MASK), HEADER("KPRCB"), OFFSET(PbMxCsr, KPRCB, MxCsr), @@ -286,13 +282,13 @@ OFFSET(PbMajorVersion, KPRCB, MajorVersion), OFFSET(PbBuildType, KPRCB, BuildType), OFFSET(PbCpuVendor, KPRCB, CpuVendor), -OFFSET(PbCoresPerPhysicalProcessor, KPRCB, CoresPerPhysicalProcessor), -OFFSET(PbLogicalProcessorsPerCore, KPRCB, LogicalProcessorsPerCore), +//OFFSET(PbCoresPerPhysicalProcessor, KPRCB, CoresPerPhysicalProcessor), +//OFFSET(PbLogicalProcessorsPerCore, KPRCB, LogicalProcessorsPerCore), OFFSET(PbApicMask, KPRCB, ApicMask), OFFSET(PbCFlushSize, KPRCB, CFlushSize), OFFSET(PbAcpiReserved, KPRCB, AcpiReserved), OFFSET(PbInitialApicId, KPRCB, InitialApicId), -OFFSET(PbStride, KPRCB, Stride), +//OFFSET(PbStride, KPRCB, Stride), OFFSET(PbLockQueue, KPRCB, LockQueue), OFFSET(PbPPLookasideList, KPRCB, PPLookasideList), OFFSET(PbPPNPagedLookasideList, KPRCB, PPNPagedLookasideList), @@ -300,22 +296,22 @@ OFFSET(PbPacketBarrier, KPRCB, PacketBarrier), OFFSET(PbDeferredReadyListHead, KPRCB, DeferredReadyListHead), OFFSET(PbLookasideIrpFloat, KPRCB, LookasideIrpFloat), -OFFSET(PbSystemCalls, KPRCB, SystemCalls), -OFFSET(PbReadOperationCount, KPRCB, ReadOperationCount), -OFFSET(PbWriteOperationCount, KPRCB, WriteOperationCount), -OFFSET(PbOtherOperationCount, KPRCB, OtherOperationCount), -OFFSET(PbReadTransferCount, KPRCB, ReadTransferCount), -OFFSET(PbWriteTransferCount, KPRCB, WriteTransferCount), -OFFSET(PbOtherTransferCount, KPRCB, OtherTransferCount), -OFFSET(PbContextSwitches, KPRCB, ContextSwitches), +//OFFSET(PbSystemCalls, KPRCB, SystemCalls), +//OFFSET(PbReadOperationCount, KPRCB, ReadOperationCount), +//OFFSET(PbWriteOperationCount, KPRCB, WriteOperationCount), +//OFFSET(PbOtherOperationCount, KPRCB, OtherOperationCount), +//OFFSET(PbReadTransferCount, KPRCB, ReadTransferCount), +//OFFSET(PbWriteTransferCount, KPRCB, WriteTransferCount), +//OFFSET(PbOtherTransferCount, KPRCB, OtherTransferCount), +//OFFSET(PbContextSwitches, KPRCB, ContextSwitches), OFFSET(PbTargetSet, KPRCB, TargetSet), OFFSET(PbIpiFrozen, KPRCB, IpiFrozen), OFFSET(PbRequestMailbox, KPRCB, RequestMailbox), OFFSET(PbSenderSummary, KPRCB, SenderSummary), -OFFSET(PbDpcListHead, KPRCB, DpcListHead), -OFFSET(PbDpcLock, KPRCB, DpcLock), -OFFSET(PbDpcQueueDepth, KPRCB, DpcQueueDepth), -OFFSET(PbDpcCount, KPRCB, DpcCount), +//OFFSET(PbDpcListHead, KPRCB, DpcListHead), +//OFFSET(PbDpcLock, KPRCB, DpcLock), +//OFFSET(PbDpcQueueDepth, KPRCB, DpcQueueDepth), +//OFFSET(PbDpcCount, KPRCB, DpcCount), OFFSET(PbDpcStack, KPRCB, DpcStack), OFFSET(PbMaximumDpcQueueDepth, KPRCB, MaximumDpcQueueDepth), OFFSET(PbDpcRequestRate, KPRCB, DpcRequestRate), @@ -345,49 +341,50 @@ OFFSET(PbParentNode, KPRCB, ParentNode), OFFSET(PbMultiThreadProcessorSet, KPRCB, MultiThreadProcessorSet), OFFSET(PbMultiThreadSetMaster, KPRCB, MultiThreadSetMaster), -OFFSET(PbStartCycles, KPRCB, StartCycles), +//OFFSET(PbStartCycles, KPRCB, StartCycles), OFFSET(PbPageColor, KPRCB, PageColor), OFFSET(PbNodeColor, KPRCB, NodeColor), OFFSET(PbNodeShiftedColor, KPRCB,NodeShiftedColor), OFFSET(PbSecondaryColorMask, KPRCB, SecondaryColorMask), OFFSET(PbSleeping, KPRCB, Sleeping), -OFFSET(PbCycleTime, KPRCB, CycleTime), -OFFSET(PbFastReadNoWait, KPRCB, FastReadNoWait), -OFFSET(PbFastReadWait, KPRCB, FastReadWait), -OFFSET(PbFastReadNotPossible, KPRCB, FastReadNotPossible), -OFFSET(PbCopyReadNoWait, KPRCB, CopyReadNoWait), -OFFSET(PbCopyReadWait, KPRCB, CopyReadWait), -OFFSET(PbCopyReadNoWaitMiss, KPRCB, CopyReadNoWaitMiss), -OFFSET(PbAlignmentFixupCount, KPRCB, AlignmentFixupCount), -OFFSET(PbExceptionDispatchCount, KPRCB, ExceptionDispatchCount), +//OFFSET(PbCycleTime, KPRCB, CycleTime), +//OFFSET(PbFastReadNoWait, KPRCB, FastReadNoWait), +//OFFSET(PbFastReadWait, KPRCB, FastReadWait), +//OFFSET(PbFastReadNotPossible, KPRCB, FastReadNotPossible), +//OFFSET(PbCopyReadNoWait, KPRCB, CopyReadNoWait), +//OFFSET(PbCopyReadWait, KPRCB, CopyReadWait), +//OFFSET(PbCopyReadNoWaitMiss, KPRCB, CopyReadNoWaitMiss), +//OFFSET(PbAlignmentFixupCount, KPRCB, AlignmentFixupCount), +//OFFSET(PbExceptionDispatchCount, KPRCB, ExceptionDispatchCount), OFFSET(PbVendorString, KPRCB, VendorString), OFFSET(PbPowerState, KPRCB, PowerState), SIZE(ProcessorBlockLength, KPRCB), HEADER("KPCR"), -OFFSET(PcGdt, KPCR, Gdt), -OFFSET(PcTss, KPCR, Tss), +//OFFSET(PcGdt, KPCR, Gdt), +//OFFSET(PcTss, KPCR, Tss), OFFSET(PcUserRsp, KPCR, UserRsp), OFFSET(PcSelf, KPCR, Self), OFFSET(PcCurrentPrcb, KPCR, CurrentPrcb), OFFSET(PcLockArray, KPCR, LockArray), -OFFSET(PcTeb, KPCR, Teb), -OFFSET(PcIdt, KPCR, Idt), +//OFFSET(PcTeb, KPCR, Teb), +//OFFSET(PcIdt, KPCR, Idt), OFFSET(PcIrql, KPCR, Irql), OFFSET(PcStallScaleFactor, KPCR, StallScaleFactor), OFFSET(PcHalReserved, KPCR, HalReserved), -OFFSET(PcPrcb, KPCR, Prcb), -OFFSET(PcMxCsr, KPCR, MxCsr), -OFFSET(PcNumber, KPCR, Number), -OFFSET(PcInterruptRequest, KPCR, InterruptRequest), -OFFSET(PcIdleHalt, KPCR, IdleHalt), -OFFSET(PcCurrentThread, KPCR, CurrentThread), -OFFSET(PcNextThread, KPCR, NextThread), -OFFSET(PcIdleThread, KPCR, IdleThread), -OFFSET(PcIpiFrozen, KPCR, IpiFrozen), -OFFSET(PcNestingLevel, KPCR, NestingLevel), -OFFSET(PcRspBase, KPCR, RspBase), -OFFSET(PcPrcbLock, KPCR, PrcbLock), +//OFFSET(PcPrcb, KPCR, Prcb), +//OFFSET(PcMxCsr, KPCR, MxCsr), +//OFFSET(PcNumber, KPCR, Number), +//OFFSET(PcInterruptRequest, KPCR, InterruptRequest), +//OFFSET(PcIdleHalt, KPCR, IdleHalt), +//OFFSET(PcCurrentThread, KPCR, CurrentThread), +//OFFSET(PcNextThread, KPCR, NextThread), +//OFFSET(PcIdleThread, KPCR, IdleThread), +//OFFSET(PcIpiFrozen, KPCR, IpiFrozen), +//OFFSET(PcNestingLevel, KPCR, NestingLevel), +//OFFSET(PcRspBase, KPCR, RspBase), +//OFFSET(PcPrcbLock, KPCR, PrcbLock), +#if 0 OFFSET(PcSetMember, KPCR, SetMember), OFFSET(PcCr0, KPCR, Cr0), OFFSET(PcCr2, KPCR, Cr2), @@ -426,31 +423,32 @@ OFFSET(PcSkipTick, KPCR, SkipTick), OFFSET(PcStartCycles, KPCR, StartCycles), SIZE(ProcessorControlRegisterLength, KPCR), +#endif HEADER("KPROCESSOR_STATE"), OFFSET(PsSpecialRegisters, KPROCESSOR_STATE, SpecialRegisters), -OFFSET(PsCr0, KPROCESSOR_STATE, Cr0), -OFFSET(PsCr2, KPROCESSOR_STATE, Cr2), -OFFSET(PsCr3, KPROCESSOR_STATE, Cr3), -OFFSET(PsCr4, KPROCESSOR_STATE, Cr4), -OFFSET(PsKernelDr0, KPROCESSOR_STATE, KernelDr0), -OFFSET(PsKernelDr1, KPROCESSOR_STATE, KernelDr1), -OFFSET(PsKernelDr2, KPROCESSOR_STATE, KernelDr2), -OFFSET(PsKernelDr3, KPROCESSOR_STATE, KernelDr3), -OFFSET(PsKernelDr6, KPROCESSOR_STATE, KernelDr6), -OFFSET(PsKernelDr7, KPROCESSOR_STATE, KernelDr7), -OFFSET(PsGdtr, KPROCESSOR_STATE, Gdtr), -OFFSET(PsIdtr, KPROCESSOR_STATE, Idtr), -OFFSET(PsTr, KPROCESSOR_STATE, Tr), -OFFSET(PsLdtr, KPROCESSOR_STATE, Ldtr), -OFFSET(PsMxCsr, KPROCESSOR_STATE, MxCsr), +OFFSET(PsCr0, KPROCESSOR_STATE, SpecialRegisters.Cr0), +OFFSET(PsCr2, KPROCESSOR_STATE, SpecialRegisters.Cr2), +OFFSET(PsCr3, KPROCESSOR_STATE, SpecialRegisters.Cr3), +OFFSET(PsCr4, KPROCESSOR_STATE, SpecialRegisters.Cr4), +OFFSET(PsKernelDr0, KPROCESSOR_STATE, SpecialRegisters.KernelDr0), +OFFSET(PsKernelDr1, KPROCESSOR_STATE, SpecialRegisters.KernelDr1), +OFFSET(PsKernelDr2, KPROCESSOR_STATE, SpecialRegisters.KernelDr2), +OFFSET(PsKernelDr3, KPROCESSOR_STATE, SpecialRegisters.KernelDr3), +OFFSET(PsKernelDr6, KPROCESSOR_STATE, SpecialRegisters.KernelDr6), +OFFSET(PsKernelDr7, KPROCESSOR_STATE, SpecialRegisters.KernelDr7), +OFFSET(PsGdtr, KPROCESSOR_STATE, SpecialRegisters.Gdtr), +OFFSET(PsIdtr, KPROCESSOR_STATE, SpecialRegisters.Idtr), +OFFSET(PsTr, KPROCESSOR_STATE, SpecialRegisters.Tr), +OFFSET(PsLdtr, KPROCESSOR_STATE, SpecialRegisters.Ldtr), +OFFSET(PsMxCsr, KPROCESSOR_STATE, SpecialRegisters.MxCsr), OFFSET(PsContextFrame, KPROCESSOR_STATE, ContextFrame), -OFFSET(PsDebugControl, KPROCESSOR_STATE, DebugControl), -OFFSET(PsLastBranchToRip, KPROCESSOR_STATE, LastBranchToRip), -OFFSET(PsLastBranchFromRip, KPROCESSOR_STATE, LastBranchFromRip), -OFFSET(PsLastExceptionToRip, KPROCESSOR_STATE, LastExceptionToRip), -OFFSET(PsLastExceptionFromRip, KPROCESSOR_STATE, LastExceptionFromRip), -OFFSET(PsCr8, KPROCESSOR_STATE, Cr8), +OFFSET(PsDebugControl, KPROCESSOR_STATE, SpecialRegisters.DebugControl), +OFFSET(PsLastBranchToRip, KPROCESSOR_STATE, SpecialRegisters.LastBranchToRip), +OFFSET(PsLastBranchFromRip, KPROCESSOR_STATE, SpecialRegisters.LastBranchFromRip), +OFFSET(PsLastExceptionToRip, KPROCESSOR_STATE, SpecialRegisters.LastExceptionToRip), +OFFSET(PsLastExceptionFromRip, KPROCESSOR_STATE, SpecialRegisters.LastExceptionFromRip), +OFFSET(PsCr8, KPROCESSOR_STATE, SpecialRegisters.Cr8), SIZE(ProcessorStateLength, KPROCESSOR_STATE), HEADER("KSTART_FRAME"), @@ -480,7 +478,7 @@ OFFSET(SrMsrSyscallMask, KSPECIAL_REGISTERS, MsrSyscallMask), HEADER("KSYSTEM_TIME"), -OFFSET(StLowTime, KSYSTEM_TIME, LowTime), +OFFSET(StLowTime, KSYSTEM_TIME, LowPart), OFFSET(StHigh1Time, KSYSTEM_TIME, High1Time), OFFSET(StHigh2Time, KSYSTEM_TIME, High2Time), @@ -555,18 +553,18 @@ HEADER("KTIMER_TABLE"), OFFSET(TtEntry, KTIMER_TABLE, TimerEntries), -OFFSET(TtTime, KTIMER_TABLE, Time), -SIZE(TIMER_ENTRY_SIZE, KTIMER_ENTRY), +OFFSET(TtTime, KTIMER_TABLE_ENTRY, Time), +SIZE(TIMER_ENTRY_SIZE, KTIMER_TABLE_ENTRY), SIZE(TIMER_TABLE_SIZE, KTIMER_TABLE), SIZE(KTIMER_TABLE_SIZE, KTIMER_TABLE), HEADER("KTSS"), -OFFSET(TssRsp0, TYPE, Rsp0), -OFFSET(TssRsp1, TYPE, Rsp1), -OFFSET(TssRsp2, TYPE, Rsp2), -OFFSET(TssPanicStack, TYPE, PanicStack), -OFFSET(TssMcaStack, TYPE, McaStack), -OFFSET(TssNmiStack, TYPE, NmiStack), -OFFSET(TssIoMapBase, TYPE, IoMapBase), -SIZE(TssLength, TYPE), - +OFFSET(TssRsp0, KTSS64, Rsp0), +OFFSET(TssRsp1, KTSS64, Rsp1), +OFFSET(TssRsp2, KTSS64, Rsp2), +OFFSET(TssPanicStack, KTSS64, Ist[1]), +OFFSET(TssMcaStack, KTSS64, Ist[2]), +OFFSET(TssNmiStack, KTSS64, Ist[3]), +OFFSET(TssIoMapBase, KTSS64, IoMapBase), +SIZE(TssLength, KTSS64), + Modified: branches/cmake-bringup/include/asm/ksx.template.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ksx.t… ============================================================================== --- branches/cmake-bringup/include/asm/ksx.template.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/ksx.template.h [iso-8859-1] Tue Dec 28 01:06:06 2010 @@ -498,9 +498,7 @@ OFFSET(PrDirectoryTableBase, KPROCESS, DirectoryTableBase), #ifdef _M_IX86 OFFSET(PrLdtDescriptor, KPROCESS, LdtDescriptor), -#endif OFFSET(PrIopmOffset, KPROCESS, IopmOffset), -#ifdef _M_IX86 OFFSET(PrInt21Descriptor, KPROCESS, Int21Descriptor), OFFSET(PrVdmTrapcHandler, KPROCESS, VdmTrapcHandler), //OFFSET(PrVdmObjects, KPROCESS, VdmObjects),

1 0

[tkreuzer] 50179: [CMAKE] Add a few definitions for amd64
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 01:04:55 2010 New Revision: 50179 URL: http://svn.reactos.org/svn/reactos?rev=50179&view=rev Log: [CMAKE] Add a few definitions for amd64 Modified: branches/cmake-bringup/include/ndk/amd64/ketypes.h Modified: branches/cmake-bringup/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ndk/amd64… ============================================================================== --- branches/cmake-bringup/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/ndk/amd64/ketypes.h [iso-8859-1] Tue Dec 28 01:04:55 2010 @@ -81,6 +81,7 @@ #define CR4_PGE 0x80 #define CR4_FXSR 0x200 #define CR4_XMMEXCPT 0x400 +#define CR4_CHANNELS 0x800 // // EFlags @@ -98,6 +99,39 @@ #define EFLAGS_USER_SANITIZE 0x3F4DD7 #define EFLAG_SIGN 0x8000 #define EFLAG_ZERO 0x4000 +#define EFLAGS_TF_MASK 0x0100 +#define EFLAGS_TF_SHIFT 0x0008 +#define EFLAGS_ID_MASK 0x200000 +#define EFLAGS_IF_MASK 0x0200 +#define EFLAGS_IF_SHIFT 0x0009 + +// +// Machine Specific Registers +// +#define MSR_EFER 0xC0000080 +#define MSR_STAR 0xC0000081 +#define MSR_LSTAR 0xC0000082 +#define MSR_CSTAR 0xC0000083 +#define MSR_SYSCALL_MASK 0xC0000084 +#define MSR_FS_BASE 0xC0000100 +#define MSR_GS_BASE 0xC0000101 +#define MSR_GS_SWAP 0xC0000102 +#define MSR_MCG_STATUS 0x017A +#define MSR_AMD_ACCESS 0x9C5A203A + +// +// Flags in MSR_EFER +// +#define MSR_LMA 0x0400 +#define MSR_LME 0x0100 +#define MSR_SCE 0x0001 +#define MSR_NXE 0x0800 +#define MSR_PAT 0x0277 +#define MSR_DEGUG_CTL 0x01D9 +#define MSR_LAST_BRANCH_FROM 0x01DB +#define MSR_LAST_BRANCH_TO 0x01DC +#define MSR_LAST_EXCEPTION_FROM 0x01DD +#define MSR_LAST_EXCEPTION_TO 0x01DE // // IPI Types @@ -114,6 +148,15 @@ #define PRCB_MAJOR_VERSION 1 #define PRCB_BUILD_DEBUG 1 #define PRCB_BUILD_UNIPROCESSOR 2 + +// +// Service Table +// +#define NUMBER_SERVICE_TABLES 2 +#define SERVICE_NUMBER_MASK 0xFFF +#define SERVICE_TABLE_SHIFT 7 +#define SERVICE_TABLE_MASK 0x20 +#define SERVICE_TABLE_TEST 0x20 // // HAL Variables @@ -143,6 +186,8 @@ #else #define SYNCH_LEVEL (IPI_LEVEL - 2) #endif + +#define NMI_STACK_SIZE 0x2000 // // Trap Frame Definition @@ -863,6 +908,56 @@ UINT64 Return; } KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; +typedef struct _DISPATCHER_CONTEXT +{ + ULONG64 ControlPc; + PVOID ImageBase; + PVOID FunctionEntry; + PVOID EstablisherFrame; + ULONG64 TargetIp; + PVOID ContextRecord; + PVOID LanguageHandler; + PVOID HandlerData; + PVOID HistoryTable; + ULONG ScopeIndex; +} DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT; + + +typedef struct _KSTART_FRAME +{ + ULONG64 P1Home; + ULONG64 P2Home; + ULONG64 P3Home; + ULONG64 P4Home; + ULONG64 P5Home; + ULONG64 Return; +} KSTART_FRAME, *PKSTART_FRAME; + +typedef struct _KSWITCH_FRAME +{ + ULONG64 P1Home; + ULONG64 P2Home; + ULONG64 P3Home; + ULONG64 P4Home; + ULONG64 P5Home; + ULONG64 ApcBypass; + ULONG64 Rbp; + ULONG64 Return; +} KSWITCH_FRAME, *PKSWITCH_FRAME; + +typedef struct _KTIMER_TABLE_ENTRY +{ + ULONG_PTR Lock; + LIST_ENTRY Entry; + ULARGE_INTEGER Time; +} KTIMER_TABLE_ENTRY, *PKTIMER_TABLE_ENTRY; + +typedef struct _KTIMER_TABLE +{ + KTIMER* TimerExpiry[64]; + KTIMER_TABLE_ENTRY TimerEntries[256]; +} KTIMER_TABLE, *PKTIMER_TABLE; + // // Inline function to get current KPRCB //

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010