commit 395fc33dc4b06c048ed35047ec461bc092ef2df3
author Greg Clayton <gclayton@apple.com> Tue Feb 15 21:59:32 2011 +0000
committer Greg Clayton <gclayton@apple.com> Tue Feb 15 21:59:32 2011 +0000
tree 444ad6d9d2daffe39ee0f143ce29d4f8b679bd4b
parent 668b45124a14cbd03e7b4965b3d86fdbf208d282

Made lldb_private::ArchSpec contain much more than just an architecture. It
now, in addition to cpu type/subtype and architecture flavor, contains:
- byte order (big endian, little endian)
- address size in bytes
- llvm::Triple for true target triple support and for more powerful plug-in
  selection.




git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@125602 91177308-0d34-0410-b5e6-96231b3b80d8

source/Expression/ClangFunction.cpp

diff --git a/source/Expression/ClangFunction.cpp b/source/Expression/ClangFunction.cpp
index 31b74c6..9ccb4fb 100644
--- a/source/Expression/ClangFunction.cpp
+++ b/source/Expression/ClangFunction.cpp
@@ -17,6 +17,7 @@
 #include "clang/CodeGen/ModuleBuilder.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/ADT/Triple.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/Module.h"
 
@@ -36,6 +37,7 @@
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Target/StopInfo.h"
+#include "lldb/Target/Target.h"
 #include "lldb/Target/Thread.h"
 #include "lldb/Target/ThreadPlan.h"
 #include "lldb/Target/ThreadPlanCallFunction.h"
@@ -48,13 +50,13 @@
 //----------------------------------------------------------------------
 ClangFunction::ClangFunction 
 (
-    const char *target_triple, 
+    ExecutionContextScope *exe_scope,
     ClangASTContext *ast_context, 
     void *return_qualtype, 
     const Address& functionAddress, 
     const ValueList &arg_value_list
 ) :
-    m_target_triple (target_triple),
+    m_arch (),
     m_function_ptr (NULL),
     m_function_addr (functionAddress),
     m_function_return_qual_type(return_qualtype),
@@ -66,16 +68,22 @@
     m_compiled (false),
     m_JITted (false)
 {
+    if (exe_scope)
+    {
+        Target *target = exe_scope->CalculateTarget();
+        if (target)
+            m_arch = target->GetArchitecture();
+    }
 }
 
 ClangFunction::ClangFunction
 (
-    const char *target_triple, 
+    ExecutionContextScope *exe_scope,
     Function &function, 
     ClangASTContext *ast_context, 
     const ValueList &arg_value_list
 ) :
-    m_target_triple (target_triple),
+    m_arch (),
     m_function_ptr (&function),
     m_function_addr (),
     m_function_return_qual_type (),
@@ -87,6 +95,13 @@
     m_compiled (false),
     m_JITted (false)
 {
+    if (exe_scope)
+    {
+        Target *target = exe_scope->CalculateTarget();
+        if (target)
+            m_arch = target->GetArchitecture();
+    }
+
     m_function_addr = m_function_ptr->GetAddressRange().GetBaseAddress();
     m_function_return_qual_type = m_function_ptr->GetReturnType().GetClangType();
 }
@@ -212,7 +227,7 @@
         
     // Okay, now compile this expression
     
-    m_parser.reset(new ClangExpressionParser(m_target_triple.c_str(), NULL, *this));
+    m_parser.reset(new ClangExpressionParser(NULL, *this));
     
     num_errors = m_parser->Parse (errors);