server: add ARM detection

André Hentschel nerv at dawncrow.de
Tue Nov 17 13:18:35 CST 2009


---
 dlls/ntdll/server.c            |    4 +++-
 include/wine/server_protocol.h |    2 +-
 server/thread.c                |    1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c
index 1eea402..5cf4dcf 100644
--- a/dlls/ntdll/server.c
+++ b/dlls/ntdll/server.c
@@ -90,6 +90,8 @@ static const enum cpu_type client_cpu = CPU_ALPHA;
 static const enum cpu_type client_cpu = CPU_POWERPC;
 #elif defined(__sparc__)
 static const enum cpu_type client_cpu = CPU_SPARC;
+#elif defined(__arm__)
+static const enum cpu_type client_cpu = CPU_ARM;
 #else
 #error Unsupported CPU
 #endif
@@ -1091,7 +1093,7 @@ size_t server_init_thread( void *entry_point )
     {
         if (ret == STATUS_NOT_SUPPORTED)
         {
-            static const char * const cpu_arch[] = { "x86", "x86_64", "Alpha", "PowerPC", "Sparc" };
+            static const char * const cpu_arch[] = { "x86", "x86_64", "Alpha", "PowerPC", "Sparc", "ARM" };
             server_protocol_error( "the running wineserver doesn't support the %s architecture.\n",
                                    cpu_arch[client_cpu] );
         }
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 6a860df..42e7003 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -129,7 +129,7 @@ typedef union
 
 enum cpu_type
 {
-    CPU_x86, CPU_x86_64, CPU_ALPHA, CPU_POWERPC, CPU_SPARC
+    CPU_x86, CPU_x86_64, CPU_ALPHA, CPU_POWERPC, CPU_SPARC, CPU_ARM
 };
 typedef int cpu_type_t;
 
diff --git a/server/thread.c b/server/thread.c
index f45be24..8fedf3f 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -1000,6 +1000,7 @@ static unsigned int get_context_system_regs( enum cpu_type cpu )
     case CPU_ALPHA:   return 0;
     case CPU_POWERPC: return 0;
     case CPU_SPARC:   return 0;
+    case CPU_ARM:     return 0;
     }
     return 0;
 }
-- 

Best Regards, André Hentschel



More information about the wine-patches mailing list