We can now build the ARM kernel (but not link it).

We now define _disable and _enable for ARM.
We shouldn't define KeRaiseIrqlToSynchLevel for each architecture, since the prototype is portable itself.
It was a mistake to guard against x86 only system calls -- the system calls should be the same on all archs, just return STATUS_NOT_IMPLEMENTED if they don't make sense. Undo the guards.
We now define KeGetPcr() as portable -- it's PCR itself that is a per-arch define.
We now support ARM in RtlWalkFrameChain.
We now support ARM in PspCreateThread.
We now define KeArchHaltProcessor for ARM by using Wait-For-Interrupt Mode.
We now define KeArmInitThreadWithContext for ARM.
KiRestore/SaveProcessorControlState are portable prototypes, we now define them as such.
Bochs KD code should use the portable WRITE/READ_PORT_UCHAR defines, we now do so.
We now support ARM in SharedUserData->ImageNumberLow/High during ExpInitializeExecutive.
NtQuerySytemInformation for SystemProcessorInformation has now been fixed to use the portable KeProcesssorXxx variables instead of reading from the non-portable PRCB values.
We now support NtFlushInstructionCache for ARM by flushing the I-Cache.

svn path=/trunk/; revision=32197

diff --git a/reactos/include/ddk/winddk.h b/reactos/include/ddk/winddk.h
index d266b31..340e98f 100644 (file)
--- a/reactos/include/ddk/winddk.h
+++ b/reactos/include/ddk/winddk.h
@@ -9495,12 +9495,6 @@ DDKAPI
 KeRaiseIrqlToDpcLevel(
   VOID);
 
-NTHALAPI
-KIRQL
-DDKAPI
-KeRaiseIrqlToSynchLevel(
-    VOID);
-
 #define KeLowerIrql(a) KfLowerIrql(a)
 #define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a)
 
@@ -9587,14 +9581,15 @@ NTAPI
 KeRaiseIrqlToDpcLevel(
   VOID);
 
+#endif
+    
 NTKERNELAPI
 KIRQL
 DDKAPI
 KeRaiseIrqlToSynchLevel(
     VOID);
 
-#endif
-
+    
 /** Memory manager routines **/
 
 NTKERNELAPI

diff --git a/reactos/include/ndk/arm/ketypes.h b/reactos/include/ndk/arm/ketypes.h
index 172b9d0..6f64e48 100644 (file)
--- a/reactos/include/ndk/arm/ketypes.h
+++ b/reactos/include/ndk/arm/ketypes.h
@@ -39,6 +39,11 @@ Author:
 #define PRCB_BUILD_DEBUG        1
 #define PRCB_BUILD_UNIPROCESSOR 2
 
+//
+// No LDTs on ARM
+//
+#define LDT_ENTRY              ULONG
+
 //
 // HAL Variables
 //

diff --git a/reactos/include/ndk/i386/ketypes.h b/reactos/include/ndk/i386/ketypes.h
index 7683b47..3e2cddc 100644 (file)
--- a/reactos/include/ndk/i386/ketypes.h
+++ b/reactos/include/ndk/i386/ketypes.h
@@ -28,9 +28,8 @@ Author:
 //
 #define K0IPCR                  ((ULONG_PTR)(KIP0PCRADDRESS))
 #define PCR                     ((volatile KPCR * const)K0IPCR)
-#if !defined(CONFIG_SMP) && !defined(NT_BUILD)
-#define KeGetPcr()              PCR
-#else
+#if defined(CONFIG_SMP) || defined(NT_BUILD)
+#undef  KeGetPcr()
 #define KeGetPcr()              ((volatile KPCR * const)__readfsdword(0x1C))
 #endif
 

diff --git a/reactos/include/ndk/kefuncs.h b/reactos/include/ndk/kefuncs.h
index 54589c9..06a16c5 100644 (file)
--- a/reactos/include/ndk/kefuncs.h
+++ b/reactos/include/ndk/kefuncs.h
@@ -457,7 +457,6 @@ NtSetIntervalProfile(
     IN KPROFILE_SOURCE ClockSource
 );
 
-#ifdef _M_IX86
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
@@ -467,7 +466,6 @@ NtSetLdtEntries(
     IN ULONG Selector2,
     IN LDT_ENTRY LdtEntry2
 );
-#endif
 
 NTSYSCALLAPI
 NTSTATUS
@@ -665,7 +663,6 @@ ZwSetIntervalProfile(
     IN KPROFILE_SOURCE ClockSource
 );
 
-#ifdef _M_IX86
 NTSYSAPI
 NTSTATUS
 NTAPI
@@ -675,7 +672,6 @@ ZwSetLdtEntries(
     IN ULONG Selector2,
     IN LDT_ENTRY LdtEntry2
 );
-#endif
 
 NTSYSAPI
 NTSTATUS

diff --git a/reactos/include/ndk/ketypes.h b/reactos/include/ndk/ketypes.h
index be5c529..dea06db 100644 (file)
--- a/reactos/include/ndk/ketypes.h
+++ b/reactos/include/ndk/ketypes.h
@@ -112,6 +112,11 @@ Author:
 #define KINTERRUPT_DISPATCH_CODES       106
 #endif
 
+//
+// Get KPCR
+//
+#define KeGetPcr()                      PCR
+
 #ifdef NTOS_MODE_USER
 
 //

diff --git a/reactos/include/psdk/intrin_arm.h b/reactos/include/psdk/intrin_arm.h
index d284160..ee18d97 100644 (file)
--- a/reactos/include/psdk/intrin_arm.h
+++ b/reactos/include/psdk/intrin_arm.h
@@ -148,5 +148,25 @@ static __inline__ __attribute__((always_inline)) long _InterlockedIncrement16(vo
        return _InterlockedExchangeAdd16(lpAddend, 1) + 1;
 }
 
+static __inline__ __attribute__((always_inline)) void _disable(void)
+{
+    __asm__ __volatile__
+    (
+     "mrs r1, cpsr;"
+     "orr r1, r1, #0x80;"
+     "msr cpsr, r1;"
+    );
+}
+
+static __inline__ __attribute__((always_inline)) void _enable(void)
+{
+    __asm__ __volatile__
+    (
+     "mrs r1, cpsr;"
+     "bic r1, r1, #0x80;"
+     "msr cpsr, r1;"
+    );
+}
+
 #endif
 /* EOF */

diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h
index 760bcf6..3776b67 100644 (file)
--- a/reactos/include/psdk/winnt.h
+++ b/reactos/include/psdk/winnt.h
@@ -4108,6 +4108,7 @@ static __inline__ struct _TEB * NtCurrentTeb(void)
 //
 // NT-ARM is not documented
 //
+#define KIRQL ULONG // Hack!
 #include <armddk.h>
     
 #else

diff --git a/reactos/include/reactos/armddk.h b/reactos/include/reactos/armddk.h
index f5277a8..3faf7cc 100644 (file)
--- a/reactos/include/reactos/armddk.h
+++ b/reactos/include/reactos/armddk.h
@@ -103,16 +103,12 @@ struct _TEB* NtCurrentTeb(VOID)
 //
 // IRQL Support on ARM is similar to MIPS/ALPHA
 //
-NTKERNELAPI
 KIRQL
-DDKAPI
 KeSwapIrql(
     IN KIRQL NewIrql
 );
 
-NTKERNELAPI
 KIRQL
-NTAPI
 KeRaiseIrqlToDpcLevel(
     VOID
 );

diff --git a/reactos/ntoskrnl/ex/init.c b/reactos/ntoskrnl/ex/init.c
index cc39da7..4f5d43b 100644 (file)
--- a/reactos/ntoskrnl/ex/init.c
+++ b/reactos/ntoskrnl/ex/init.c
@@ -1229,6 +1229,9 @@ ExpInitializeExecutive(IN ULONG Cpu,
 #elif defined(_MIPS_)
     SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_R4000;
     SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_R4000;
+#elif defined(_ARM_)
+    SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_ARM;
+    SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_ARM;
 #else
 #error "Unsupported ReactOS Target"
 #endif

diff --git a/reactos/ntoskrnl/ex/sysinfo.c b/reactos/ntoskrnl/ex/sysinfo.c
index a13f1d2..ae6d04c 100644 (file)
--- a/reactos/ntoskrnl/ex/sysinfo.c
+++ b/reactos/ntoskrnl/ex/sysinfo.c
@@ -531,11 +531,11 @@ QSI_DEF(SystemProcessorInformation)
                return (STATUS_INFO_LENGTH_MISMATCH);
        }
        Prcb = KeGetCurrentPrcb();
-       Spi->ProcessorArchitecture = 0; /* Intel Processor */
-       Spi->ProcessorLevel        = Prcb->CpuType;
-       Spi->ProcessorRevision     = Prcb->CpuStep;
+       Spi->ProcessorArchitecture = KeProcessorArchitecture;
+       Spi->ProcessorLevel        = KeProcessorLevel;
+       Spi->ProcessorRevision     = KeProcessorRevision;
        Spi->Reserved              = 0;
-       Spi->ProcessorFeatureBits          = Prcb->FeatureBits;
+       Spi->ProcessorFeatureBits          = KeFeatureBits;
 
        DPRINT("Arch %d Level %d Rev 0x%x\n", Spi->ProcessorArchitecture,
                Spi->ProcessorLevel, Spi->ProcessorRevision);
@@ -1927,6 +1927,8 @@ NtFlushInstructionCache (
 #elif defined(_M_MIPS)
     DPRINT1("NtFlushInstructionCache() is not implemented\n");
     for (;;);
+#elif defined(_M_ARM)
+    __asm__ __volatile__("mov r1, #0; mcr p15, 0, r1, c7, c5, 0");
 #else
 #error Unknown architecture
 #endif

diff --git a/reactos/ntoskrnl/include/internal/arch/intrin_i.h b/reactos/ntoskrnl/include/internal/arch/intrin_i.h
index de147bb..18b4c6c 100644 (file)
--- a/reactos/ntoskrnl/include/internal/arch/intrin_i.h
+++ b/reactos/ntoskrnl/include/internal/arch/intrin_i.h
@@ -26,9 +26,7 @@
 #elif defined(_M_MIPS)\r
 #include "../mips/intrin_i.h"\r
 #elif defined(_M_ARM)\r
-//\r
-// Not sure we'll need ARM internal intrinsics\r
-//\r
+#include "../arm/intrin_i.h"\r
 #else\r
 #error "Unknown processor"\r
 #endif\r

diff --git a/reactos/ntoskrnl/include/internal/arm/intrin_i.h b/reactos/ntoskrnl/include/internal/arm/intrin_i.h
new file mode 100644 (file)
index 0000000..eec0652
--- /dev/null
+++ b/reactos/ntoskrnl/include/internal/arm/intrin_i.h
@@ -0,0 +1,18 @@
+#ifndef _INTRIN_INTERNAL_
+#define _INTRIN_INTERNAL_
+
+static __inline__ __attribute__((always_inline)) void KeArchHaltProcessor(void)
+{
+    //
+    // Enter Wait-For-Interrupt Mode
+    //
+    __asm__ __volatile__
+    (
+     "mov r1, #0;"
+     "mcr p15, 0, r1, c7, c0, 4;"
+     );
+}
+
+#endif
+
+/* EOF */

diff --git a/reactos/ntoskrnl/include/internal/arm/ke.h b/reactos/ntoskrnl/include/internal/arm/ke.h
index 8b13789..e9eb048 100644 (file)
--- a/reactos/ntoskrnl/include/internal/arm/ke.h
+++ b/reactos/ntoskrnl/include/internal/arm/ke.h
@@ -1 +1,20 @@
+#ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARM_KE_H
+#define __NTOSKRNL_INCLUDE_INTERNAL_ARM_KE_H
 
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+VOID
+NTAPI
+KeArmInitThreadWithContext(
+    IN PKTHREAD Thread,
+    IN PKSYSTEM_ROUTINE SystemRoutine,
+    IN PKSTART_ROUTINE StartRoutine,
+    IN PVOID StartContext,
+    IN PCONTEXT Context
+);
+
+#define KeArchInitThreadWithContext KeArmInitThreadWithContext
+
+#endif
\ No newline at end of file

diff --git a/reactos/ntoskrnl/include/internal/i386/ke.h b/reactos/ntoskrnl/include/internal/i386/ke.h
index 0f09dd1..fbc8f59 100644 (file)
--- a/reactos/ntoskrnl/include/internal/i386/ke.h
+++ b/reactos/ntoskrnl/include/internal/i386/ke.h
@@ -61,18 +61,6 @@ Ki386InitializeTss(
     IN PKGDTENTRY Gdt
 );
 
-VOID
-NTAPI
-KiRestoreProcessorControlState(
-    IN PKPROCESSOR_STATE ProcessorState
-);
-
-VOID
-NTAPI
-KiSaveProcessorControlState(
-    OUT PKPROCESSOR_STATE ProcessorState
-);
-
 VOID
 FASTCALL
 KiIdleLoop(VOID);

diff --git a/reactos/ntoskrnl/include/internal/ke.h b/reactos/ntoskrnl/include/internal/ke.h
index 583f257..58075df 100644 (file)
--- a/reactos/ntoskrnl/include/internal/ke.h
+++ b/reactos/ntoskrnl/include/internal/ke.h
@@ -972,6 +972,18 @@ KeReleaseQueuedSpinLockFromDpcLevel(
     IN OUT PKSPIN_LOCK_QUEUE LockQueue
 );
 
+VOID
+NTAPI
+KiRestoreProcessorControlState(
+    IN PKPROCESSOR_STATE ProcessorState
+);
+
+VOID
+NTAPI
+KiSaveProcessorControlState(
+    OUT PKPROCESSOR_STATE ProcessorState
+);
+
 #include "ke_x.h"
 
 #endif /* __NTOSKRNL_INCLUDE_INTERNAL_KE_H */

diff --git a/reactos/ntoskrnl/kd/wrappers/bochs.c b/reactos/ntoskrnl/kd/wrappers/bochs.c
index ee95696..df2702b 100644 (file)
--- a/reactos/ntoskrnl/kd/wrappers/bochs.c
+++ b/reactos/ntoskrnl/kd/wrappers/bochs.c
@@ -12,7 +12,7 @@
 #include <internal/debug.h>
 
 /* bochs debug output */
-#define BOCHS_LOGGER_PORT (0xe9)
+#define BOCHS_LOGGER_PORT ((PVOID)0xe9)
 
 /* FUNCTIONS *****************************************************************/
 
@@ -27,9 +27,9 @@ KdpBochsDebugPrint(IN PCH Message,
     {
         if (*Message == '\n')
         {
-           __outbyte(BOCHS_LOGGER_PORT, '\r');
+           WRITE_PORT_UCHAR(BOCHS_LOGGER_PORT, '\r');
         }
-        __outbyte(BOCHS_LOGGER_PORT, *Message);
+        WRITE_PORT_UCHAR(BOCHS_LOGGER_PORT, *Message);
         Message++;
     }
 }
@@ -44,8 +44,8 @@ KdpBochsInit(PKD_DISPATCH_TABLE DispatchTable,
 
     if (BootPhase == 0)
     {
-        Value = __inbyte(BOCHS_LOGGER_PORT);
-        if (Value != BOCHS_LOGGER_PORT)
+        Value = READ_PORT_UCHAR(BOCHS_LOGGER_PORT);
+        if (Value != (ULONG)BOCHS_LOGGER_PORT)
         {
            KdpDebugMode.Bochs = FALSE;
            return;

diff --git a/reactos/ntoskrnl/mm/mminit.c b/reactos/ntoskrnl/mm/mminit.c
index 2f47cce..6a0c70a 100644 (file)
--- a/reactos/ntoskrnl/mm/mminit.c
+++ b/reactos/ntoskrnl/mm/mminit.c
@@ -112,7 +112,7 @@ MmInitVirtualMemory(ULONG_PTR LastKernelAddress,
     */
    MiInitPageDirectoryMap();
 
-   BaseAddress = (PVOID)KIP0PCRADDRESS;
+   BaseAddress = (PVOID)PCR;
    MmCreateMemoryArea(MmGetKernelAddressSpace(),
                       MEMORY_AREA_SYSTEM,
                       &BaseAddress,

diff --git a/reactos/ntoskrnl/ps/thread.c b/reactos/ntoskrnl/ps/thread.c
index db48805..2fc851e 100644 (file)
--- a/reactos/ntoskrnl/ps/thread.c
+++ b/reactos/ntoskrnl/ps/thread.c
@@ -325,10 +325,14 @@ PspCreateThread(OUT PHANDLE ThreadHandle,
         Thread->StartAddress = (PVOID)ThreadContext->Eip;
         Thread->Win32StartAddress = (PVOID)ThreadContext->Eax;
 #elif defined(_M_PPC)
-       Thread->StartAddress = (PVOID)ThreadContext->Dr0;
-       Thread->Win32StartAddress = (PVOID)ThreadContext->Gpr3;
+        Thread->StartAddress = (PVOID)ThreadContext->Dr0;
+        Thread->Win32StartAddress = (PVOID)ThreadContext->Gpr3;
 #elif defined(_M_MIPS)
-        for (;;);
+        Thread->StartAddress = (PVOID)ThreadContext->Psr;
+        Thread->Win32StartAddress = (PVOID)ThreadContext->IntA0;
+#elif defined(_M_ARM)
+        Thread->StartAddress = (PVOID)ThreadContext->Pc;
+        Thread->Win32StartAddress = (PVOID)ThreadContext->R0;
 #else
 #error Unknown architecture
 #endif

diff --git a/reactos/ntoskrnl/rtl/libsupp.c b/reactos/ntoskrnl/rtl/libsupp.c
index a229835..b0356ea 100644 (file)
--- a/reactos/ntoskrnl/rtl/libsupp.c
+++ b/reactos/ntoskrnl/rtl/libsupp.c
@@ -284,6 +284,8 @@ RtlWalkFrameChain(OUT PVOID *Callers,
         __asm__("move $sp, %0" : "=r" (Stack) : );
 #elif defined(_M_PPC)
     __asm__("mr %0,1" : "=r" (Stack) : );
+#elif defined(_M_ARM)
+    __asm__("mov sp, %0" : "=r"(Stack) : );
 #else
 #error Unknown architecture
 #endif