[ros-diffs] [tkreuzer] 44430: - merge r44429 - fix hal_generic_amd64.rbuild - add missing files

Author: tkreuzer
Date: Sun Dec  6 03:44:06 2009
New Revision: 44430

URL: http://svn.reactos.org/svn/reactos?rev=44430&view=rev
Log:
- merge r44429
- fix hal_generic_amd64.rbuild
- add missing files

Added:
    trunk/reactos/lib/sdk/crt/except/amd64/
    trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s   (with props)
    trunk/reactos/lib/sdk/crt/except/amd64/seh.s   (with props)
Modified:
    trunk/reactos/ReactOS-amd64.rbuild
    trunk/reactos/ReactOS-generic.rbuild
    trunk/reactos/ReactOS-i386.rbuild
    trunk/reactos/hal/halx86/hal_generic_amd64.rbuild

Modified: trunk/reactos/ReactOS-amd64.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-amd64.rbuild?rev=4…
==============================================================================
--- trunk/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-amd64.rbuild [iso-8859-1] Sun Dec  6 03:44:06 2009
@@ -6,6 +6,8 @@
 			<xi:include href="config-amd64.template.rbuild" />
 		</xi:fallback>
 	</xi:include>
+
+	<xi:include href="ReactOS-generic.rbuild" />
 
 	<define name="_M_AMD64" />
 	<define name="_AMD64_" />
@@ -21,132 +23,31 @@
 	<property name="usewrc" value="false"/>
 	<property name="WINEBUILD_FLAGS" value="--kill-at"/>
 
-	<if property="OPTIMIZE" value="1">
-		<compilerflag>-Os</compilerflag>
-		<compilerflag>-ftracer</compilerflag>
-		<compilerflag>-momit-leaf-frame-pointer</compilerflag>
-	</if>
-	<if property="OPTIMIZE" value="2">
-		<compilerflag>-Os</compilerflag>
-	</if>
-	<if property="OPTIMIZE" value="3">
-		<compilerflag>-O1</compilerflag>
-	</if>
-	<if property="OPTIMIZE" value="4">
-		<compilerflag>-O2</compilerflag>
-	</if>
-	<if property="OPTIMIZE" value="5">
-		<compilerflag>-O3</compilerflag>
-	</if>
-
-	<compilerflag>-U_X86_</compilerflag>
-	<compilerflag>-mpreferred-stack-boundary=4</compilerflag>
-	<compilerflag>-fno-strict-aliasing</compilerflag>
-	<compilerflag>-Wno-strict-aliasing</compilerflag>
-	<compilerflag>-Wpointer-arith</compilerflag>
-	<compilerflag>-Wno-multichar</compilerflag>
-	<compilerflag>-Wno-format</compilerflag>
-	<!-- compilerflag>-H</compilerflag>    enable this for header traces -->
+	<group compilerset="gcc">
+		<if property="OPTIMIZE" value="1">
+			<compilerflag>-ftracer</compilerflag>
+			<compilerflag>-momit-leaf-frame-pointer</compilerflag>
+		</if>
+		<compilerflag>-mpreferred-stack-boundary=4</compilerflag>
+		<compilerflag compiler="midl">-m64 --win64</compilerflag>
+		<!-- compilerflag compiler="cc,cxx">-gstabs+</compilerflag -->
+		<!-- compilerflag compiler="as">-gstabs+</compilerflag -->
+		<compilerflag>-U_X86_</compilerflag>
+		<compilerflag>-Wno-format</compilerflag>
+	</group>
 
 	<group linkerset="ld">
 		<linkerflag>-disable-stdcall-fixup</linkerflag>
-		<linkerflag>-static</linkerflag>
-		<linkerflag>--unique=.eh_frame</linkerflag>
 		<linkerflag>-file-alignment=0x1000</linkerflag>
 		<linkerflag>-section-alignment=0x1000</linkerflag>
+		<linkerflag>--unique=.eh_frame</linkerflag>
+		<linkerflag>-static</linkerflag>
 	</group>
-
-<!-- Here starts <xi:include href="ReactOS-generic.rbuild" /> -->
-
-	<xi:include href="baseaddress.rbuild" />
-
-	<define name="__REACTOS__" />
-	<define name="__REACTOS__" host="true" />
-
-	<if property="DBG" value="1">
-		<define name="DBG">1</define>
-		<define name="_SEH_ENABLE_TRACE" />
-		<property name="DBG_OR_KDBG" value="true" />
-	</if>
-	<if property="DBG" value="0">
-		<define name="DBG">0</define>
-	</if>
-
-	<if property="KDBG" value="1">
-		<define name="KDBG">1</define>
-		<property name="DBG_OR_KDBG" value="true" />
-	</if>
-
-	<!-- The version target valid values are: Nt4 , NT5 , NT51 -->
-	<property name="VERSION_TARGET" value="NT52" />
-
-	<if property="VERSION_TARGET" value="NT4">
-		<define name="WINVER">0x400</define>
-		<define name="_WIN32_IE">0x600</define>
-		<define name="_WIN32_WINNT">0x400</define>
-		<define name="_WIN32_WINDOWS">0x400</define>
-		<define name="_SETUPAPI_VER">0x400</define>
-	</if>
-
-	<if property="VERSION_TARGET" value="NT5">
-		<define name="WINVER">0x500</define>
-		<define name="_WIN32_IE">0x600</define>
-		<define name="_WIN32_WINNT">0x500</define>
-		<define name="_WIN32_WINDOWS">0x500</define>
-		<define name="_SETUPAPI_VER">0x500</define>
-	</if>
-
-	<if property="VERSION_TARGET" value="NT51">
-		<define name="WINVER">0x501</define>
-		<define name="_WIN32_IE">0x600</define>
-		<define name="_WIN32_WINNT">0x501</define>
-		<define name="_WIN32_WINDOWS">0x501</define>
-		<define name="_SETUPAPI_VER">0x501</define>
-	</if>
-
-	<if property="VERSION_TARGET" value="NT52">
-		<define name="WINVER">0x502</define>
-		<define name="_WIN32_IE">0x600</define>
-		<define name="_WIN32_WINNT">0x502</define>
-		<define name="_WIN32_WINDOWS">0x502</define>
-		<define name="_SETUPAPI_VER">0x502</define>
-	</if>
-
-	<if property="VERSION_TARGET" value="NT6">
-		<define name="WINVER">0x600</define>
-		<define name="_WIN32_IE">0x600</define>
-		<define name="_WIN32_WINNT">0x600</define>
-		<define name="_WIN32_WINDOWS">0x600</define>
-		<define name="_SETUPAPI_VER">0x600</define>
-	</if>
-
-	<include>.</include>
-	<include>include</include>
-	<include root="intermediate">include</include>
-	<include>include/psdk</include>
-	<include root="intermediate">include/psdk</include>
-	<include>include/dxsdk</include>
-	<include root="intermediate">include/dxsdk</include>
-	<include>include/crt</include>
-	<include>include/crt/mingw32</include>
-	<include>include/ddk</include>
-	<include>include/GL</include>
-	<include>include/ndk</include>
-	<include>include/reactos</include>
-	<include root="intermediate">include/reactos</include>
-	<include root="intermediate">include/reactos/mc</include>
-	<include>include/reactos/libs</include>
-
-	<include host="true">include</include>
-	<include host="true"
root="intermediate">include</include>
-	<include host="true">include/reactos</include>
-	<include host="true">include/reactos/wine</include>
 
 	<if property="USERMODE" value="1">
 		<directory name="base">
 			<xi:include href="base/base.rbuild" />
 		</directory>
-
 		<directory name="dll">
 			<xi:include href="dll/dll.rbuild" />
 		</directory>
@@ -155,173 +56,35 @@
 	<directory name="boot">
 		<xi:include href="boot/boot.rbuild" />
 	</directory>
-
 	<directory name="drivers">
-		<directory name="base">
-			<xi:include href="drivers/base/directory.rbuild" />
-		</directory>
-		<directory name="bus">
-			<xi:include href="drivers/bus/directory.rbuild" />
-		</directory>
-		<directory name="directx">
-			<xi:include href="drivers/directx/directory.rbuild" />
-		</directory>
-		<directory name="filesystems">
-			<xi:include href="drivers/filesystems/directory.rbuild" />
-		</directory>
-		<directory name="input">
-			<xi:include href="drivers/input/directory.rbuild" />
-		</directory>
-		<directory name="ksfilter">
-			<xi:include href="drivers/ksfilter/directory.rbuild" />
-		</directory>
-
-		<!-- directory name="multimedia">
-			<xi:include href="drivers/multimedia/directory.rbuild" />
-		</directory -->
-
-		<directory name="network">
-			<xi:include href="drivers/network/directory.rbuild" />
-		</directory>
-		<directory name="parallel">
-			<xi:include href="drivers/parallel/directory.rbuild" />
-		</directory>
-		<directory name="serial">
-			<xi:include href="drivers/serial/directory.rbuild" />
-		</directory>
-		<directory name="setup">
-			<xi:include href="drivers/setup/directory.rbuild" />
-		</directory>
-		<directory name="storage">
-            <xi:include href="drivers/storage/directory.rbuild" />
-		</directory>
-		<directory name="usb">
-			<xi:include href="drivers/usb/directory.rbuild" />
-		</directory>
-		<directory name="video">
-			<xi:include href="drivers/video/directory.rbuild" />
-		</directory>
-			<directory name="wdm">
-			<xi:include href="drivers/wdm/wdm.rbuild" />
-		</directory>
-		<directory name="wmi">
-			<xi:include href="drivers/wmi/wmilib.rbuild" />
-		</directory>
+		<xi:include href="drivers/drivers.rbuild" />
 	</directory>
-
 	<directory name="hal">
 		<xi:include href="hal/hal.rbuild" />
 	</directory>
-
 	<directory name="include">
 		<xi:include href="include/directory.rbuild" />
 	</directory>
-
 	<directory name="lib">
-		<directory name="3rdparty">
-			<directory name="adns">
-				<xi:include href="lib/3rdparty/adns/adns.rbuild" />
-			</directory>
-			<directory name="bzip2">
-				<xi:include href="lib/3rdparty/bzip2/bzip2.rbuild" />
-			</directory>
-			<directory name="cardlib">
-				<xi:include href="lib/3rdparty/cardlib/cardlib.rbuild" />
-			</directory>
-			<directory name="expat">
-				<xi:include href="lib/3rdparty/expat/expat.rbuild" />
-			</directory>
-			<directory name="freetype">
-				<xi:include href="lib/3rdparty/freetype/freetype.rbuild" />
-			</directory>
-			<directory name="icu4ros">
-				<xi:include href="lib/3rdparty/icu4ros/icu4ros.rbuild" />
-			</directory>
-			<directory name="libsamplerate">
-				<xi:include href="lib/3rdparty/libsamplerate/libsamplerate.rbuild"
/>
-			</directory>
-			<directory name="libwine">
-				<xi:include href="lib/3rdparty/libwine/libwine.rbuild" />
-			</directory>
-			<directory name="libxml2">
-				<xi:include href="lib/3rdparty/libxml2/libxml2.rbuild" />
-			</directory>
-
-			<if property="USERMODE" value="1">
-				<directory name="mingw">
-					<xi:include href="lib/3rdparty/mingw/mingw.rbuild" />
-				</directory>
-			</if>
-			<directory name="zlib">
-				<xi:include href="lib/3rdparty/zlib/zlib.rbuild" />
-			</directory>
-		</directory>
-		<directory name="sdk">
-			<xi:include href="lib/sdk/sdk.rbuild" />
-		</directory>
-		<directory name="cmlib">
-			<xi:include href="lib/cmlib/cmlib.rbuild" />
-		</directory>
-		<directory name="debugsup">
-			<xi:include href="lib/debugsup/debugsup.rbuild" />
-		</directory>
-		<directory name="drivers">
-			<xi:include href="lib/drivers/directory.rbuild" />
-		</directory>
-		<directory name="epsapi">
-			<xi:include href="lib/epsapi/epsapi.rbuild" />
-		</directory>
-		<directory name="fslib">
-			<xi:include href="lib/fslib/directory.rbuild" />
-		</directory>
-		<directory name="host">
-			<xi:include href="lib/host/directory.rbuild" />
-		</directory>
-		<directory name="inflib">
-			<xi:include href="lib/inflib/inflib.rbuild" />
-		</directory>
-		<directory name="nls">
-			<xi:include href="lib/nls/nls.rbuild" />
-		</directory>
-		<directory name="ntdllsys">
-			<xi:include href="lib/ntdllsys/ntdllsys.rbuild" />
-		</directory>
-		<directory name="pseh">
-			<xi:include href="lib/pseh/pseh.rbuild" />
-		</directory>
-		<directory name="recyclebin">
-			<xi:include href="lib/recyclebin/recyclebin.rbuild" />
-		</directory>
-		<directory name="rossym">
-			<xi:include href="lib/rossym/rossym.rbuild" />
-		</directory>
-		<directory name="rtl">
-			<xi:include href="lib/rtl/rtl.rbuild" />
-		</directory>
-		<directory name="smlib">
-			<xi:include href="lib/smlib/smlib.rbuild" />
-		</directory>
-		<directory name="win32ksys">
-			<xi:include href="lib/win32ksys/win32ksys.rbuild" />
-		</directory>
+		<xi:include href="lib/lib.rbuild" />
 	</directory>
-
 	<directory name="media">
 		<xi:include href="media/media.rbuild" />
 	</directory>
-
+	<directory name="modules">
+		<xi:include href="modules/directory.rbuild" />
+	</directory>
 	<directory name="ntoskrnl">
 		<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
+		<if property="BUILD_MP" value="1">
+			<xi:include href="ntoskrnl/ntkrnlmp.rbuild" />
+		</if>
 	</directory>
-
 	<directory name="subsystems">
 		<xi:include href="subsystems/subsystems.rbuild" />
 	</directory>
-
 	<directory name="tools">
 		<xi:include href="tools/tools.rbuild" />
 	</directory>
 
-<!-- Here ends <xi:include href="ReactOS-generic.rbuild" /> -->
-
 </project>

Modified: trunk/reactos/ReactOS-generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev…
==============================================================================
--- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Sun Dec  6 03:44:06 2009
@@ -89,8 +89,6 @@
 	<group compilerset="gcc">
 		<compilerflag>-Wall</compilerflag>
 		<compilerflag
compiler="cxx">-Wno-non-virtual-dtor</compilerflag>
-		<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
-		<compilerflag compiler="as">-gstabs+</compilerflag>
 	</group>
 
 	<group compilerset="msc">
@@ -156,5 +154,4 @@
 		<compilerflag>/GS-</compilerflag>
 	</group>
 
-	<define name="_USE_32BIT_TIME_T" />
 </group>

Modified: trunk/reactos/ReactOS-i386.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=44…
==============================================================================
--- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Sun Dec  6 03:44:06 2009
@@ -15,6 +15,7 @@
 	<define name="TARGET_i386" host="true" />
 
 	<define name="USE_COMPILER_EXCEPTIONS" />
+	<define name="_USE_32BIT_TIME_T" />
 
 	<property name="PLATFORM" value="PC"/>
 
@@ -25,6 +26,8 @@
 		</if>
 		<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
 		<compilerflag compiler="midl">-m32 --win32</compilerflag>
+		<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
+		<compilerflag compiler="as">-gstabs+</compilerflag>
 	</group>
 
 	<group linkerset="ld">

Modified: trunk/reactos/hal/halx86/hal_generic_amd64.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_amd…
==============================================================================
--- trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] Sun Dec  6 03:44:06
2009
@@ -10,6 +10,7 @@
 				<file>bushndlr.c</file>
 				<file>isabus.c</file>
 				<file>halbus.c</file>
+				<file>pcibus.c</file>
 				<file>pcidata.c</file>
 				<file>sysbus.c</file>
 			</directory>
@@ -18,7 +19,6 @@
 			<file>dma.c</file>
 			<file>drive.c</file>
 			<file>display.c</file>
-			<file>pci.c</file>
 			<file>profil.c</file>
 			<file>reboot.c</file>
 			<file>sysinfo.c</file>

Added: trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/c…
==============================================================================
--- trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s (added)
+++ trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] Sun Dec  6 03:44:06
2009
@@ -1,0 +1,31 @@
+/*
+ * COPYRIGHT:         See COPYING in the top level directory
+ * PROJECT:           ReactOS system libraries
+ * PURPOSE:           Implementation of _chkstk and _alloca_probe
+ * FILE:              lib/sdk/crt/math/amd64/chkstk_asm.s
+ * PROGRAMMER:        Timo Kreuzer (timo.kreuzer(a)reactos.org)
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <ndk/amd64/asm.h>
+#include <ndk/amd64/asmmacro.S>
+
+.intel_syntax noprefix
+
+.global _MsgUnimplemented
+_MsgUnimplemented:
+.asciz "WARNING:  %s at %s:%d is UNIMPLEMENTED!\n"
+
+
+.proc _chkstk
+    UNIMPLEMENTED chkstk
+    ret
+.endproc
+
+.proc _alloca_probe
+    UNIMPLEMENTED alloca_probe
+    ret
+.endproc
+
+/* EOF */

Propchange: trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/lib/sdk/crt/except/amd64/seh.s
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/s…
==============================================================================
--- trunk/reactos/lib/sdk/crt/except/amd64/seh.s (added)
+++ trunk/reactos/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] Sun Dec  6 03:44:06 2009
@@ -1,0 +1,56 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS CRT
+ * FILE:            lib/crt/misc/i386/seh.S
+ * PURPOSE:         SEH Support for the CRT
+ * PROGRAMMERS:     Alex Ionescu (alex.ionescu(a)reactos.org)
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <ndk/asm.h>
+.intel_syntax noprefix
+
+#define DISPOSITION_DISMISS         0
+#define DISPOSITION_CONTINUE_SEARCH 1
+#define DISPOSITION_COLLIDED_UNWIND 3
+
+/* GLOBALS *******************************************************************/
+
+.globl __global_unwind2
+.globl __local_unwind2
+.globl __abnormal_termination
+.globl __except_handler2
+.globl __except_handler3
+
+/* FUNCTIONS *****************************************************************/
+
+.func unwind_handler
+_unwind_handler:
+    ret
+.endfunc
+
+.func _global_unwind2
+__global_unwind2:
+    ret
+.endfunc
+
+.func _abnormal_termination
+__abnormal_termination:
+    ret
+.endfunc
+
+.func _local_unwind2
+__local_unwind2:
+    ret
+.endfunc
+
+.func _except_handler2
+__except_handler2:
+    ret
+.endfunc
+
+.func _except_handler3
+__except_handler3:
+    ret
+.endfunc

Propchange: trunk/reactos/lib/sdk/crt/except/amd64/seh.s
------------------------------------------------------------------------------
    svn:eol-style = native