[ros-diffs] [tkreuzer] 49681: [HAL] Convert asm to new syntax, use spec file

Author: tkreuzer
Date: Sun Nov 21 10:10:38 2010
New Revision: 49681

URL: http://svn.reactos.org/svn/reactos?rev=49681&view=rev
Log:
[HAL]
Convert asm to new syntax, use spec file


Modified:
    branches/cmake-bringup/hal/CMakeLists.txt
    branches/cmake-bringup/hal/halx86/amd64/mps.S
    branches/cmake-bringup/hal/halx86/amd64/systimer.S
    branches/cmake-bringup/hal/halx86/generic/bios.c
    branches/cmake-bringup/hal/halx86/generic/i386/systimer.S
    branches/cmake-bringup/hal/halx86/generic/i386/trap.S
    branches/cmake-bringup/hal/halx86/mp/i386/mps.S

Modified: branches/cmake-bringup/hal/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx…
==============================================================================
--- branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Sun Nov 21 10:10:38 2010
@@ -1,3 +1,5 @@
+
+spec2def(hal.dll hal.spec)
 
 if(ARCH MATCHES i386)
 
@@ -51,7 +53,8 @@
     ${HAL_GENERIC_PCAT_SOURCE}
     ${HAL_GENERIC_UP_SOURCE}
     halx86/up/halinit_up.c
-    halx86/up/halup.rc)
+    halx86/up/halup.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/hal.def)
 
 add_library(hal SHARED ${HAL_SOURCE})
 add_pch(hal ${CMAKE_CURRENT_SOURCE_DIR}/halx86/include/hal.h ${HAL_SOURCE})
@@ -63,9 +66,7 @@
 
 add_importlibs(hal ntoskrnl)
 
-target_link_libraries(hal
-    ${CMAKE_CURRENT_SOURCE_DIR}/halx86/hal_i386.def
-    libcntpr)
+target_link_libraries(hal libcntpr)
 
 list(APPEND MINI_HAL_SOURCE
     halx86/generic/legacy/bus/bushndlr.c
@@ -106,4 +107,4 @@
 #TBD
 endif(ARCH MATCHES i386)
 
-add_importlib_target(hal.spec)
+add_importlib_target(hal.spec)

Modified: branches/cmake-bringup/hal/halx86/amd64/mps.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/amd64/…
==============================================================================
--- branches/cmake-bringup/hal/halx86/amd64/mps.S [iso-8859-1] (original)
+++ branches/cmake-bringup/hal/halx86/amd64/mps.S [iso-8859-1] Sun Nov 21 10:10:38 2010
@@ -8,8 +8,9 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+
+#include <ksamd64.inc>
 
 /* FUNCTIONS *****************************************************************/
 
@@ -92,5 +93,5 @@
   	AFTER
   	iret
   
-  
+END
 /* EOF */

Modified: branches/cmake-bringup/hal/halx86/amd64/systimer.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/amd64/…
==============================================================================
--- branches/cmake-bringup/hal/halx86/amd64/systimer.S [iso-8859-1] (original)
+++ branches/cmake-bringup/hal/halx86/amd64/systimer.S [iso-8859-1] Sun Nov 21 10:10:38
2010
@@ -7,8 +7,9 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+
+#include <ksamd64.inc>
 
 /* GLOBALS *******************************************************************/
 
@@ -90,3 +91,4 @@
     UNIMPLEMENTED _HalpClockInterrupt
     iret
 
+END

Modified: branches/cmake-bringup/hal/halx86/generic/bios.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/generi…
==============================================================================
--- branches/cmake-bringup/hal/halx86/generic/bios.c [iso-8859-1] (original)
+++ branches/cmake-bringup/hal/halx86/generic/bios.c [iso-8859-1] Sun Nov 21 10:10:38
2010
@@ -197,9 +197,9 @@
 /* V86 TRAP HANDLERS **********************************************************/
 
 #ifndef _MINIHAL_
+DECLSPEC_NORETURN
 VOID
 FASTCALL
-DECLSPEC_NORETURN
 HalpTrap0DHandler(IN PKTRAP_FRAME TrapFrame)
 {
     /* Enter the trap */

Modified: branches/cmake-bringup/hal/halx86/generic/i386/systimer.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/generi…
==============================================================================
--- branches/cmake-bringup/hal/halx86/generic/i386/systimer.S [iso-8859-1] (original)
+++ branches/cmake-bringup/hal/halx86/generic/i386/systimer.S [iso-8859-1] Sun Nov 21
10:10:38 2010
@@ -7,8 +7,9 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/asm.h>
+#include <asm.inc>
+
+#include <ks386.inc>
 
 EXTERN _HalpAcquireSystemHardwareSpinLock@0:PROC
 EXTERN _HalpReleaseCmosSpinLock@0:PROC
@@ -39,7 +40,7 @@
 /* GLOBALS *******************************************************************/
 
 .data
-//ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING
+ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING
 
 PUBLIC _HalpPerfCounter
 _HalpLastPerfCounterLow:    .long 0

Modified: branches/cmake-bringup/hal/halx86/generic/i386/trap.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/generi…
==============================================================================
--- branches/cmake-bringup/hal/halx86/generic/i386/trap.S [iso-8859-1] (original)
+++ branches/cmake-bringup/hal/halx86/generic/i386/trap.S [iso-8859-1] Sun Nov 21 10:10:38
2010
@@ -8,12 +8,12 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/i386/asm.h>
+#include <asm.inc>
+
+#include <ks386.inc>
 #include <internal/i386/asmmacro.S>
 
-.code32
-.text
+.code
 
 TRAP_ENTRY HalpTrap0D, 0
 TRAP_ENTRY HalpApcInterrupt, KI_SOFTWARE_TRAP
@@ -42,4 +42,6 @@
 .space 2048
 _HalpRealModeEnd:
 PUBLIC _HalpRealModeEnd
+.endcode16
 
+END

Modified: branches/cmake-bringup/hal/halx86/mp/i386/mps.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/mp/i38…
==============================================================================
--- branches/cmake-bringup/hal/halx86/mp/i386/mps.S [iso-8859-1] (original)
+++ branches/cmake-bringup/hal/halx86/mp/i386/mps.S [iso-8859-1] Sun Nov 21 10:10:38 2010
@@ -11,7 +11,9 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ndk/asm.h>
+#include <asm.inc>
+
+#include <ks386.inc>
 
 /* FUNCTIONS *****************************************************************/