[Lldb-commits] [PATCH] D62159: LLGS: support 32-bit on 64-bit hosts

[Saleem Abdulrasool via Phabricator via lldb-commits]

compnerd updated this revision to Diff 200366.
compnerd added a comment.

Fix inclusion


Repository:
  rLLDB LLDB

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D62159/new/

https://reviews.llvm.org/D62159

Files:
  tools/lldb-server/SystemInitializerLLGS.cpp


Index: tools/lldb-server/SystemInitializerLLGS.cpp
===================================================================
--- tools/lldb-server/SystemInitializerLLGS.cpp
+++ tools/lldb-server/SystemInitializerLLGS.cpp
@@ -19,15 +19,14 @@
 using HostObjectFile = ObjectFileELF;
 #endif

-#if defined(__arm__) || defined(__arm) || defined(_ARM) || defined(_M_ARM)
-#define LLDB_TARGET_ARM
-#include "Plugins/Instruction/ARM/EmulateInstructionARM.h"
+#if defined(__arm64__) || defined(__aarch64__) || defined(_M_ARM64)
+#define LLDB_TARGET_ARM64
 #endif

-#if defined(__mips__) || defined(mips) || defined(__mips) ||                   
\
-    defined(__MIPS__) || defined(_M_MIPS)
-#define LLDB_TARGET_MIPS
-#include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h"
+#if defined(__arm__) || defined(__arm) || defined(_ARM) || defined(_M_ARM) ||  
\
+    defined(LLDB_TARGET_ARM64)
+#define LLDB_TARGET_ARM
+#include "Plugins/Instruction/ARM/EmulateInstructionARM.h"
 #endif

 #if defined(__mips64__) || defined(mips64) || defined(__mips64) ||             
\
@@ -36,6 +35,12 @@
 #include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h"
 #endif

+#if defined(__mips__) || defined(mips) || defined(__mips) ||                   
\
+    defined(__MIPS__) || defined(_M_MIPS) || defined(LLDB_TARGET_MIPS64)
+#define LLDB_TARGET_MIPS
+#include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h"
+#endif
+
 using namespace lldb_private;

 llvm::Error SystemInitializerLLGS::Initialize() {
@@ -44,10 +49,10 @@

   HostObjectFile::Initialize();

-#if defined(LLDB_TARGET_ARM)
+#if defined(LLDB_TARGET_ARM) || defined(LLDB_TARGET_ARM64)
   EmulateInstructionARM::Initialize();
 #endif
-#if defined(LLDB_TARGET_MIPS)
+#if defined(LLDB_TARGET_MIPS) || defined(LLDB_TARGET_MIPS64)
   EmulateInstructionMIPS::Initialize();
 #endif
 #if defined(LLDB_TARGET_MIPS64)
@@ -60,10 +65,10 @@
 void SystemInitializerLLGS::Terminate() {
   HostObjectFile::Terminate();

-#if defined(LLDB_TARGET_ARM)
+#if defined(LLDB_TARGET_ARM) || defined(LLDB_TARGET_ARM64)
   EmulateInstructionARM::Terminate();
 #endif
-#if defined(LLDB_TARGET_MIPS)
+#if defined(LLDB_TARGET_MIPS) || defined(LLDB_TARGET_MIPS64)
   EmulateInstructionMIPS::Terminate();
 #endif
 #if defined(LLDB_TARGET_MIPS64)



Index: tools/lldb-server/SystemInitializerLLGS.cpp
===================================================================
--- tools/lldb-server/SystemInitializerLLGS.cpp
+++ tools/lldb-server/SystemInitializerLLGS.cpp
@@ -19,15 +19,14 @@
 using HostObjectFile = ObjectFileELF;
 #endif

-#if defined(__arm__) || defined(__arm) || defined(_ARM) || defined(_M_ARM)
-#define LLDB_TARGET_ARM
-#include "Plugins/Instruction/ARM/EmulateInstructionARM.h"
+#if defined(__arm64__) || defined(__aarch64__) || defined(_M_ARM64)
+#define LLDB_TARGET_ARM64
 #endif

-#if defined(__mips__) || defined(mips) || defined(__mips) ||                   \
-    defined(__MIPS__) || defined(_M_MIPS)
-#define LLDB_TARGET_MIPS
-#include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h"
+#if defined(__arm__) || defined(__arm) || defined(_ARM) || defined(_M_ARM) ||  \
+    defined(LLDB_TARGET_ARM64)
+#define LLDB_TARGET_ARM
+#include "Plugins/Instruction/ARM/EmulateInstructionARM.h"
 #endif

 #if defined(__mips64__) || defined(mips64) || defined(__mips64) ||             \
@@ -36,6 +35,12 @@
 #include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h"
 #endif

+#if defined(__mips__) || defined(mips) || defined(__mips) ||                   \
+    defined(__MIPS__) || defined(_M_MIPS) || defined(LLDB_TARGET_MIPS64)
+#define LLDB_TARGET_MIPS
+#include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h"
+#endif
+
 using namespace lldb_private;

 llvm::Error SystemInitializerLLGS::Initialize() {
@@ -44,10 +49,10 @@

   HostObjectFile::Initialize();

-#if defined(LLDB_TARGET_ARM)
+#if defined(LLDB_TARGET_ARM) || defined(LLDB_TARGET_ARM64)
   EmulateInstructionARM::Initialize();
 #endif
-#if defined(LLDB_TARGET_MIPS)
+#if defined(LLDB_TARGET_MIPS) || defined(LLDB_TARGET_MIPS64)
   EmulateInstructionMIPS::Initialize();
 #endif
 #if defined(LLDB_TARGET_MIPS64)
@@ -60,10 +65,10 @@
 void SystemInitializerLLGS::Terminate() {
   HostObjectFile::Terminate();

-#if defined(LLDB_TARGET_ARM)
+#if defined(LLDB_TARGET_ARM) || defined(LLDB_TARGET_ARM64)
   EmulateInstructionARM::Terminate();
 #endif
-#if defined(LLDB_TARGET_MIPS)
+#if defined(LLDB_TARGET_MIPS) || defined(LLDB_TARGET_MIPS64)
   EmulateInstructionMIPS::Terminate();
 #endif
 #if defined(LLDB_TARGET_MIPS64)

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits