Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 48327: - Delete ppcdevtree.
by akhaldi＠svn.reactos.org 28 Jul '10

28 Jul '10

Author: akhaldi Date: Wed Jul 28 10:45:51 2010 New Revision: 48327 URL: http://svn.reactos.org/svn/reactos?rev=48327&view=rev Log: - Delete ppcdevtree. Removed: trunk/reactos/lib/ppcdevtree/

1 0

[akhaldi] 48326: [CMAKE] - Add ntdllsys to build.
by akhaldi＠svn.reactos.org 28 Jul '10

28 Jul '10

Author: akhaldi Date: Wed Jul 28 10:35:37 2010 New Revision: 48326 URL: http://svn.reactos.org/svn/reactos?rev=48326&view=rev Log: [CMAKE] - Add ntdllsys to build. Added: branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt (with props) Modified: branches/cmake-bringup/lib/CMakeLists.txt Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Wed Jul 28 10:35:37 2010 @@ -13,6 +13,7 @@ add_subdirectory(fslib) add_subdirectory(lsalib) add_subdirectory(nls) +add_subdirectory(ntdllsys) add_subdirectory(pseh) add_subdirectory(recyclebin) add_subdirectory(rossym) Added: branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/ntdllsys/CMak… ============================================================================== --- branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt [iso-8859-1] Wed Jul 28 10:35:37 2010 @@ -1,0 +1,13 @@ + +get_directory_property(defines COMPILE_DEFINITIONS) + +foreach(arg ${defines}) + set(result_defs "${result_defs} -D${arg}") +endforeach(arg ${defines}) + +set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> ${result_defs} -D__ASM__ <FLAGS> -c <SOURCE>") + +set_source_files_properties(${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S PROPERTIES GENERATED TRUE) + +add_library(ntdllsys ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) +add_dependencies(ntdllsys nci_resources) Propchange: branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48325: [CMAKE] - Rename ncitool to nci and mark it as an exported native tool. - Add nci generated intermediate files to build.
by akhaldi＠svn.reactos.org 28 Jul '10

28 Jul '10

Author: akhaldi Date: Wed Jul 28 10:13:27 2010 New Revision: 48325 URL: http://svn.reactos.org/svn/reactos?rev=48325&view=rev Log: [CMAKE] - Rename ncitool to nci and mark it as an exported native tool. - Add nci generated intermediate files to build. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/toolchain-mingw32.cmake branches/cmake-bringup/tools/nci/CMakeLists.txt 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] Wed Jul 28 10:13:27 2010 @@ -16,7 +16,7 @@ add_subdirectory(tools) add_subdirectory(lib) -export(TARGETS widl wmc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) +export(TARGETS widl wmc nci FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) else() @@ -70,5 +70,42 @@ add_subdirectory(lib) +# nci generated intermediate files + +set(nci_output + ${REACTOS_BINARY_DIR}/ntoskrnl/include/internal/napi.h + ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h + ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S + ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S + ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S + ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec +) + +# stupid nci tool can't create folders itself, se we're gonna create them for it +set(nci_folders + dll\\ntdll\\def + lib\\ntdllsys\\ntdll + lib\\win32ksys + ntoskrnl\\include\\internal + ntoskrnl\\ex + subsystems\\win32\\win32k\\include +) + +ADD_CUSTOM_COMMAND( + OUTPUT ${nci_folders} + COMMAND mkdir ${MKDIR_ARG} ${nci_folders} + WORKING_DIRECTORY ${REACTOS_BINARY_DIR} +) + +ADD_CUSTOM_COMMAND( + OUTPUT ${nci_output} + COMMAND native-nci -arch ${ARCH} ${REACTOS_SOURCE_DIR}/ntoskrnl/sysfuncs.lst ${REACTOS_SOURCE_DIR}/subsystems/win32/win32k/w32ksvc.db ${nci_output} + DEPENDS native-nci ${nci_folders} +) + +SET_SOURCE_FILES_PROPERTIES(${nci_output} PROPERTIES GENERATED TRUE) + +ADD_CUSTOM_TARGET(nci_resources ALL DEPENDS ${nci_output}) + endif() 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] Wed Jul 28 10:13:27 2010 @@ -4,8 +4,10 @@ # Choose the right MinGW prefix if (CMAKE_HOST_SYSTEM_NAME MATCHES Windows) set(MINGW_PREFIX "") +set(MKDIR_ARG "") else() set(MINGW_PREFIX "mingw32-") +set(MKDIR_ARG "-p") endif() # the name of the target operating system Modified: branches/cmake-bringup/tools/nci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/nci/CMakeLi… ============================================================================== --- branches/cmake-bringup/tools/nci/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/nci/CMakeLists.txt [iso-8859-1] Wed Jul 28 10:13:27 2010 @@ -1,4 +1,4 @@ file(GLOB_RECURSE SOURCE "*.c") -add_executable(ncitool ${SOURCE}) +add_executable(nci ${SOURCE})

1 0

[tkreuzer] 48324: reduce diff to trunk
by tkreuzer＠svn.reactos.org 28 Jul '10

28 Jul '10

Author: tkreuzer Date: Wed Jul 28 03:03:44 2010 New Revision: 48324 URL: http://svn.reactos.org/svn/reactos?rev=48324&view=rev Log: reduce diff to trunk Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/mesa32.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/mesa32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/mesa32.rbuild [iso-8859-1] Wed Jul 28 03:03:44 2010 @@ -11,10 +11,6 @@ <define name="BUILD_GL32" /> <define name="WIN32" /> <define name="USE_EXTERNAL_DXTN_LIB=1" /> - <if property="ARCH" value="amd64"> -  - <define name="dllexport">aligned(1)</define> - </if> <if property="ARCH" value="i386"> <define name="USE_X86_ASM" /> <define name="USE_MMX_ASM" />

1 0

[tkreuzer] 48323: Revert accidental changes to swprintf as well Now the kernel loads again
by tkreuzer＠svn.reactos.org 28 Jul '10

28 Jul '10

Author: tkreuzer Date: Wed Jul 28 02:59:33 2010 New Revision: 48323 URL: http://svn.reactos.org/svn/reactos?rev=48323&view=rev Log: Revert accidental changes to swprintf as well Now the kernel loads again Modified: branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c [iso-8859-1] Wed Jul 28 02:59:33 2010 @@ -27,40 +27,33 @@ #define SPECIAL 32 /* 0x */ #define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ #define REMOVEHEX 256 /* use 256 as remve 0x frim BASE 16 */ -typedef struct { - unsigned int mantissal:32; - unsigned int mantissah:20; - unsigned int exponent:11; - unsigned int sign:1; +typedef union { + struct { + unsigned int mantissal:32; + unsigned int mantissah:20; + unsigned int exponent:11; + unsigned int sign:1; + }; + long long AsLongLong; } double_t; + +/* We depend on this being true */ +C_ASSERT(sizeof(double_t) == sizeof(double)); static __inline int -_isinf(double __x) -{ - union - { - double* __x; - double_t* x; - } x; - - x.__x = &__x; - return ( x.x->exponent == 0x7ff && ( x.x->mantissah == 0 && x.x->mantissal == 0 )); +_isinf(double_t x) +{ + return ( x.exponent == 0x7ff && ( x.mantissah == 0 && x.mantissal == 0 )); } static __inline int -_isnan(double __x) -{ - union - { - double* __x; - double_t* x; - } x; - x.__x = &__x; - return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 )); +_isnan(double_t x) +{ + return ( x.exponent == 0x7ff && ( x.mantissah != 0 || x.mantissal != 0 )); } @@ -179,14 +172,13 @@ } static wchar_t * -numberf(wchar_t * buf, wchar_t * end, double num, int base, int size, int precision, int type) +numberf(wchar_t * buf, wchar_t * end, double_t num, int base, int size, int precision, int type) { wchar_t c, sign, tmp[66]; const wchar_t *digits; const wchar_t *small_digits = L"0123456789abcdefghijklmnopqrstuvwxyz"; const wchar_t *large_digits = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; int i; - long long x; /* FIXME the float version of number is direcly copy of number @@ -201,9 +193,9 @@ c = (type & ZEROPAD) ? L'0' : L' '; sign = 0; if (type & SIGN) { - if (num < 0) { + if (num.sign) { sign = L'-'; - num = -num; + num.sign = 0; size--; } else if (type & PLUS) { sign = L'+'; @@ -220,15 +212,11 @@ size--; } i = 0; - if (num == 0) + if (num.AsLongLong == 0) tmp[i++] = L'0'; - else while (num != 0) - { - x = num; - tmp[i++] = digits[do_div(&x,base)]; -#ifndef _M_ARM // Missing __floatdidf in CeGCC 0.55 -- GCC 4.4 - num = x; -#endif + else while (num.AsLongLong != 0) + { + tmp[i++] = digits[do_div(&num.AsLongLong,base)]; } if (i > precision) precision = i; @@ -394,7 +382,7 @@ const char *s; const wchar_t *sw; const wchar_t *ss; - double _double; + double_t _double; int flags; /* flags to number() */ @@ -600,7 +588,7 @@ case 'f': case 'g': case 'G': - _double = (double)va_arg(args, double); + _double = va_arg(args, double_t); if ( _isnan(_double) ) { ss = L"Nan";

1 0

[tkreuzer] 48322: [WIN32CSR] - Fix array subscript out of bounds error - Fix a cast
by tkreuzer＠svn.reactos.org 28 Jul '10

28 Jul '10

Author: tkreuzer Date: Wed Jul 28 01:17:23 2010 New Revision: 48322 URL: http://svn.reactos.org/svn/reactos?rev=48322&view=rev Log: [WIN32CSR] - Fix array subscript out of bounds error - Fix a cast Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] Wed Jul 28 01:17:23 2010 @@ -780,7 +780,7 @@ current = CONTAINING_RECORD(current_entry, CSRSS_PROCESS_DATA, ProcessEntry); if (++nItems <= Request->Data.GetProcessListRequest.nMaxIds) { - *Buffer++ = (DWORD)current->ProcessId; + *Buffer++ = HandleToUlong(current->ProcessId); } } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] Wed Jul 28 01:17:23 2010 @@ -383,13 +383,12 @@ { /* Print the string into the buffer */ StringCbPrintfW(TextStringU->Buffer, - TextStringU->MaximumLength, - FormatString, - Parameters[0], - Parameters[1], - Parameters[2], - Parameters[3], - Parameters[4]); + TextStringU->MaximumLength, + FormatString, + Parameters[0], + Parameters[1], + Parameters[2], + Parameters[3]); Status = STATUS_SUCCESS; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)

1 0

[tkreuzer] 48321: [NDK] Merge r41483 from amd64 branch: - Fix definition of HARDERROR_MSG
by tkreuzer＠svn.reactos.org 28 Jul '10

28 Jul '10

Author: tkreuzer Date: Wed Jul 28 00:26:43 2010 New Revision: 48321 URL: http://svn.reactos.org/svn/reactos?rev=48321&view=rev Log: [NDK] Merge r41483 from amd64 branch: - Fix definition of HARDERROR_MSG Modified: trunk/reactos/ (props changed) trunk/reactos/include/ndk/extypes.h Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 28 00:26:43 2010 @@ -1,4 +1,4 @@ /branches/header-work:45691-47721 /branches/reactos-yarotows:46372,46848,46966,47800,48026,48064 /branches/ros-amd64-bringup:36852 -/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Wed Jul 28 00:26:43 2010 @@ -640,7 +640,7 @@ ULONG Response; ULONG NumberOfParameters; ULONG UnicodeStringParameterMask; - ULONG Parameters[MAXIMUM_HARDERROR_PARAMETERS]; + ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS]; } HARDERROR_MSG, *PHARDERROR_MSG; //

1 0

[akhaldi] 48320: [CMAKE] - Add pseh to build.
by akhaldi＠svn.reactos.org 28 Jul '10

28 Jul '10

Author: akhaldi Date: Wed Jul 28 00:08:02 2010 New Revision: 48320 URL: http://svn.reactos.org/svn/reactos?rev=48320&view=rev Log: [CMAKE] - Add pseh to build. Added: branches/cmake-bringup/lib/pseh/CMakeLists.txt (with props) Modified: branches/cmake-bringup/lib/CMakeLists.txt Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Wed Jul 28 00:08:02 2010 @@ -13,7 +13,7 @@ add_subdirectory(fslib) add_subdirectory(lsalib) add_subdirectory(nls) -#add_subdirectory(pseh) +add_subdirectory(pseh) add_subdirectory(recyclebin) add_subdirectory(rossym) add_subdirectory(rtl) Added: branches/cmake-bringup/lib/pseh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/pseh/CMakeLis… ============================================================================== --- branches/cmake-bringup/lib/pseh/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/pseh/CMakeLists.txt [iso-8859-1] Wed Jul 28 00:08:02 2010 @@ -1,0 +1,16 @@ + +file(GLOB_RECURSE ARCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}/*.S) + +get_directory_property(defines COMPILE_DEFINITIONS) + +foreach(arg ${defines}) + set(result_defs "${result_defs} -D${arg}") +endforeach(arg ${defines}) + +set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> ${result_defs} -D__ASM__ <FLAGS> -c <SOURCE>") + +file(GLOB SOURCE "*.c") + +add_library(pseh ${ARCH_SOURCE} ${SOURCE}) +add_dependencies(pseh psdk) + Propchange: branches/cmake-bringup/lib/pseh/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48319: [CMAKE] - Add rtl to build.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 23:55:52 2010 New Revision: 48319 URL: http://svn.reactos.org/svn/reactos?rev=48319&view=rev Log: [CMAKE] - Add rtl to build. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/lib/CMakeLists.txt branches/cmake-bringup/lib/rtl/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 Jul 27 23:55:52 2010 @@ -19,6 +19,9 @@ export(TARGETS widl wmc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) else() + +# Activate support for asm source files +enable_language(ASM) set(IMPORT_EXECUTABLES "${REACTOS_SOURCE_DIR}/build/ImportExecutables.cmake" CACHE FILEPATH "Host executables") include(${IMPORT_EXECUTABLES}) @@ -68,3 +71,4 @@ add_subdirectory(lib) endif() + Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Tue Jul 27 23:55:52 2010 @@ -16,7 +16,7 @@ #add_subdirectory(pseh) add_subdirectory(recyclebin) add_subdirectory(rossym) -#add_subdirectory(rtl) +add_subdirectory(rtl) add_subdirectory(sdk) add_subdirectory(smlib) add_subdirectory(tdilib) Modified: branches/cmake-bringup/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/CMakeList… ============================================================================== --- branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] Tue Jul 27 23:55:52 2010 @@ -1,4 +1,28 @@ -file(GLOB_RECURSE SOURCE "*.c") +include_directories(.) -add_library(rtl ${SOURCE}) +add_definitions(-D_NTOSKRNL_) +add_definitions(-DNO_RTL_INLINES) +add_definitions(-D_NTSYSTEM_) +add_definitions(-D_NTDLLBUILD_) + +file(GLOB_RECURSE ARCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}/*.S) + +get_directory_property(defines COMPILE_DEFINITIONS) + +foreach(arg ${defines}) + set(result_defs "${result_defs} -D${arg}") +endforeach(arg ${defines}) + +set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> ${result_defs} -D__ASM__ <FLAGS> -c <SOURCE>") + +file(GLOB SOURCE "*.c") + +list(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/avlsupp.c + ${CMAKE_CURRENT_SOURCE_DIR}/mem.c + ${CMAKE_CURRENT_SOURCE_DIR}/memgen.c + ) + +add_library(rtl ${ARCH_SOURCE} ${SOURCE}) +add_dependencies(rtl psdk) + 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 Jul 27 23:55:52 2010 @@ -1,3 +1,6 @@ + +SET(ARCH i386) + # Choose the right MinGW prefix if (CMAKE_HOST_SYSTEM_NAME MATCHES Windows) set(MINGW_PREFIX "") @@ -13,6 +16,8 @@ SET(CMAKE_C_COMPILER ${MINGW_PREFIX}gcc) SET(CMAKE_CXX_COMPILER ${MINGW_PREFIX}g++) +SET(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) + # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search # programs in the host environment

1 0

[tkreuzer] 48318: [FREELDR] - Move all 16 bit code to .text16 section - Fix linking issues with x86_16_SwitchToLong, by using a relative call - Align pagetables by page size - Add mainCRTStartup entry point freeldr now starts again
by tkreuzer＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: tkreuzer Date: Tue Jul 27 21:49:19 2010 New Revision: 48318 URL: http://svn.reactos.org/svn/reactos?rev=48318&view=rev Log: [FREELDR] - Move all 16 bit code to .text16 section - Fix linking issues with x86_16_SwitchToLong, by using a relative call - Align pagetables by page size - Add mainCRTStartup entry point freeldr now starts again Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/int386.S branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mb.S branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_amd64.lnk Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] Tue Jul 27 21:49:19 2010 @@ -1,11 +1,10 @@ .intel_syntax noprefix -.text -.code16 #define ASM #include <arch.h> -//.org 0x8000 +.code16 +.section .text16, "x" .global RealEntryPoint RealEntryPoint: @@ -284,6 +283,7 @@ jmp LMODE_CS:offset LongCat //Load CS with 64 bit segment and flush the instruction cache .code64 +.text LongCat: /* Set up 64 bit stack */ mov rsp, stack64 @@ -378,6 +378,7 @@ /** Some data *****************************************************************/ +.text .code64 stack16: @@ -449,6 +450,6 @@ /* Need to include them here, because of linking issues between 64 / 16 bit */ //#include "debug16.S" #include "int386.S" -#include "boot.S" +//#include "boot.S" #include "i386pnp.S" Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S [iso-8859-1] Tue Jul 27 21:49:19 2010 @@ -4,9 +4,8 @@ .intel_syntax noprefix -.text - .code16 +.section .text16, "x" #define BootSectorStackTop 0x7bf2 #define DataAreaStartHigh 0x2 @@ -48,13 +47,14 @@ // encode a jmp instruction to jump to 0000:8200 //.org 0x8000 -.global _mainCRTStartup // For Mingw32 builds where the linker looks for this symbol -_mainCRTStartup: +.global mainCRTStartup // For Mingw32 builds where the linker looks for this symbol +mainCRTStartup: .global start start: - .byte 0xe9 - .byte 0xfd - .byte 0x01 + jmp RealEntryPoint +// .byte 0xe9 +// .byte 0xfd +// .byte 0x01 // Now starts the extra boot code that we will store // in the first 512 bytes of freeldr.sys. This code @@ -67,7 +67,7 @@ push ax // First save AX - the start cluster of freeldr.sys - +#if 0 // Display "Loading FreeLoader..." message mov esi, offset msgLoading // Loading message call [bp-PutCharsOffset] // Display it @@ -117,15 +117,17 @@ pop es jmp LoadFile // Load the next cluster (if any) - +#endif LoadFile_Done: mov dl, [bp+BootDrive] // Load the boot drive into DL mov dh, BootPartition // Load the boot partition into DH - push word ptr 0x0000 - push word ptr 0x8000 // We will do a far return to 0000:8000h - -// retf // Transfer control to ROSLDR - .byte 0xcb // == retf + + push 0 // push segment (0x0000) + mov bx, [0x8000 + 0xA8] // load the RVA of the EntryPoint into eax + add bx, 0x8000 // RVA -> VA and skip 3 bytes (jump to fathelper code) + push bx // push offset +// retf // Transfer control to FreeLoader + .byte 0xcb // == retf // Reads the entire FAT into memory at 7000:0000 @@ -224,7 +226,8 @@ ret - +.text +.code64 msgLoading: .ascii "Loading FreeLoader..." .byte 0x0d,0x0a,0 Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S [iso-8859-1] Tue Jul 27 21:49:19 2010 @@ -17,13 +17,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - .text - .code16 - #define ASM - #include <arch.h> +.code64 +.text /* * U32 PnpBiosSupported(VOID); @@ -144,7 +142,7 @@ movzx ecx, ax mov _pnp_result, ecx - call x86_16_SwitchToLong + call [x86_16_SwitchToLong_ptr] .code64 mov esi, [rbp + 0x08] @@ -236,7 +234,7 @@ movzx ecx, ax mov _pnp_result, ecx - call x86_16_SwitchToLong + call [x86_16_SwitchToLong_ptr] .code64 /* update node number */ @@ -255,4 +253,7 @@ ret +x86_16_SwitchToLong_ptr: + .quad x86_16_SwitchToLong + /* EOF */ Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/int386.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/int386.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/int386.S [iso-8859-1] Tue Jul 27 21:49:19 2010 @@ -17,13 +17,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - .intel_syntax noprefix - .text - .code16 +.intel_syntax noprefix #define ASM #include <arch.h> +.code64 +.text Int386_REGS: @@ -59,6 +59,10 @@ .quad 0 Int386_regsout: .quad 0 + + +.code16 +.section .text16, "x" /* * int Int386(int ivec, REGS* in, REGS* out); Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mb.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mb.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mb.S [iso-8859-1] Tue Jul 27 21:49:19 2010 @@ -49,7 +49,8 @@ .byte 0 .endr -.bss +.text +.align 4096 PageDirectoryStart: pml4_startup: .fill 4096, 1, 0 Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] Tue Jul 27 21:49:19 2010 @@ -17,7 +17,7 @@ </if> <ifnot property="ARCH" value="powerpc"> - <module name="freeldr" type="bootloader" baseaddress="$(BASEADDRESS_FREELDR)"> + <module name="freeldr" type="bootloader" baseaddress="$(BASEADDRESS_FREELDR)" entrypoint="mainCRTStartup"> <linkerscript>freeldr_$(ARCH).lnk</linkerscript> <bootstrap installbase="loader" /> <library>freeldr_startup</library> Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_amd64.lnk URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_amd64.lnk [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_amd64.lnk [iso-8859-1] Tue Jul 27 21:49:19 2010 @@ -2,7 +2,13 @@ ENTRY(_mainCRTStartup) SECTIONS { - .text __image_base__ + __section_alignment__ : + .text16 __image_base__ + __section_alignment__ : + { + __text16_start__ = . ; + *(.text16) + __text16_end__ = . ; + } + .text BLOCK(__section_alignment__) : { __text_start__ = .; *(.init) @@ -19,12 +25,6 @@ *(.gcc_exc) __text_end__ = .; *(.gcc_except_table) - } - init BLOCK(__section_alignment__) : - { - __init_start__ = . ; - *(init) - __init_end__ = . ; } .data BLOCK(__section_alignment__) : { @@ -44,14 +44,6 @@ *(SORT(.rdata$*)) *(.eh_frame) } - .stab BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stab ] - } - .stabstr BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stabstr ] - } }

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