Fix some bugs from D5988

[jhibbits]

Summary

Ed Maste found some problems with the commit in D5988. Address most of these.
While here, also add floating point return handling. This doesn't handle
128-bit long double yet. Since I don't have any system that uses it, I don't
currently have plans to implement it.

[emaste]

LGTM

[jhibbits]

Closed by commit rL220963 (authored by @jhibbits).

lldb/trunk/lib/Makefile

USEDLIBS = lldbAPI.a \
   lldbDataFormatters.a \
   lldbExpression.a \
   lldbHostCommon.a \
   lldbInitAndLog.a \
   lldbInterpreter.a \
   lldbPluginABIMacOSX_arm.a \
   lldbPluginABIMacOSX_arm64.a \
   lldbPluginABIMacOSX_i386.a \
+  lldbPluginABISysV_ppc.a \
   lldbPluginABISysV_ppc64.a \
   lldbPluginABISysV_x86_64.a \
   lldbPluginABISysV_hexagon.a \
   lldbPluginDisassemblerLLVM.a \
   lldbPluginDynamicLoaderStatic.a \
   lldbPluginDynamicLoaderPOSIX.a \
   lldbPluginDynamicLoaderHexagon.a \
   lldbPluginEmulateInstructionARM.a \

lldb/trunk/source/Core/ArchSpec.cpp

 
 #include <string>
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/COFF.h"
 #include "llvm/Support/ELF.h"
 #include "llvm/Support/Host.h"
 #include "lldb/Utility/SafeMachO.h"
-#include "lldb/Core/Log.h"
 #include "lldb/Core/RegularExpression.h"
 #include "lldb/Core/StringList.h"
 #include "lldb/Host/Endian.h"
 #include "lldb/Host/HostInfo.h"
 #include "lldb/Target/Platform.h"
 
 using namespace lldb;
 using namespace lldb_private;

lldb/trunk/source/Host/freebsd/Host.cpp

struct {
         int ps_nenvstr;
     } ps_strings;
     void *ps_strings_addr, *auxv_addr;
     struct privElf32_Auxinfo { int a_type; unsigned int a_val; } aux_info32[AT_COUNT];
     struct ptrace_io_desc pid;
     DataBufferSP buf_sp;
     std::unique_ptr<DataBufferHeap> buf_ap(new DataBufferHeap(1024, 0));
 
+    // TODO:FIXME: Need a way to get this dynamically, instead of a magic
+    // constant that only works on a single architecture.
     ps_strings_addr = (void *)0xffffdff0;
     pid.piod_op = PIOD_READ_D;
     pid.piod_addr = &ps_strings;
     pid.piod_offs = ps_strings_addr;
     pid.piod_len = sizeof(ps_strings);
     if (::ptrace(PT_IO, process->GetID(), (caddr_t)&pid, 0)) {
         perror("failed to fetch ps_strings");
         buf_ap.release();

lldb/trunk/source/Plugins/ABI/CMakeLists.txt

 add_subdirectory(SysV-hexagon)
-add_subdirectory(SysV-ppc64)
 add_subdirectory(SysV-ppc)
+add_subdirectory(SysV-ppc64)
 add_subdirectory(SysV-x86_64)
 add_subdirectory(MacOSX-i386)
 add_subdirectory(MacOSX-arm)
 add_subdirectory(MacOSX-arm64)

lldb/trunk/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.cpp

if (type_flags & eTypeIsScalar)
         else if (type_flags & eTypeIsFloat)
         {
             if (type_flags & eTypeIsComplex)
             {
                 // Don't handle complex yet.
             }
             else
             {
+                const size_t byte_size = return_clang_type.GetByteSize();
+                if (byte_size <= sizeof(long double))
+                {
+                    const RegisterInfo *f1_info = reg_ctx->GetRegisterInfoByName("f1", 0);
+                    RegisterValue f1_value;
+                    if (reg_ctx->ReadRegister (f1_info, f1_value))
+                    {
+                        DataExtractor data;
+                        if (f1_value.GetData(data))
+                        {
+                            lldb::offset_t offset = 0;
+                            if (byte_size == sizeof(float))
+                            {
+                                value.GetScalar() = (float) data.GetFloat(&offset);
+                                success = true;
+                            }
+                            else if (byte_size == sizeof(double))
+                            {
+                                value.GetScalar() = (double) data.GetDouble(&offset);
+                                success = true;
+                            }
+                        }
+                    }
+                }
             }
         }
 
         if (success)
             return_valobj_sp = ValueObjectConstResult::Create (thread.GetStackFrameAtIndex(0).get(),
                                                                value,
                                                                ConstString(""));
 

lldb/trunk/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.cpp

if (type_flags & eTypeIsScalar)
         else if (type_flags & eTypeIsFloat)
         {
             if (type_flags & eTypeIsComplex)
             {
                 // Don't handle complex yet.
             }
             else
             {
+                const size_t byte_size = return_clang_type.GetByteSize();
+                if (byte_size <= sizeof(long double))
+                {
+                    const RegisterInfo *f1_info = reg_ctx->GetRegisterInfoByName("f1", 0);
+                    RegisterValue f1_value;
+                    if (reg_ctx->ReadRegister (f1_info, f1_value))
+                    {
+                        DataExtractor data;
+                        if (f1_value.GetData(data))
+                        {
+                            lldb::offset_t offset = 0;
+                            if (byte_size == sizeof(float))
+                            {
+                                value.GetScalar() = (float) data.GetFloat(&offset);
+                                success = true;
+                            }
+                            else if (byte_size == sizeof(double))
+                            {
+                                value.GetScalar() = (double) data.GetDouble(&offset);
+                                success = true;
+                            }
+                        }
+                    }
+                }
             }
         }
 
         if (success)
             return_valobj_sp = ValueObjectConstResult::Create (thread.GetStackFrameAtIndex(0).get(),
                                                                value,
                                                                ConstString(""));
 

lldb/trunk/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp

PlatformFreeBSD::GetSoftwareBreakpointTrapOpcode (Target &target, BreakpointSite *bp_site)
     case llvm::Triple::x86:
     case llvm::Triple::x86_64:
         {
             static const uint8_t g_i386_opcode[] = { 0xCC };
             trap_opcode = g_i386_opcode;
             trap_opcode_size = sizeof(g_i386_opcode);
         }
         break;
-  case llvm::Triple::ppc:
-  case llvm::Triple::ppc64:
-    {
-      static const uint8_t g_ppc_opcode[] = { 0x7f, 0xe0, 0x00, 0x08 };
-      trap_opcode = g_ppc_opcode;
-      trap_opcode_size = sizeof(g_ppc_opcode);
-    }
+    case llvm::Triple::ppc:
+    case llvm::Triple::ppc64:
+        {
+            static const uint8_t g_ppc_opcode[] = { 0x7f, 0xe0, 0x00, 0x08 };
+            trap_opcode = g_ppc_opcode;
+            trap_opcode_size = sizeof(g_ppc_opcode);
+        }
     }
 
     if (bp_site->SetTrapOpcode(trap_opcode, trap_opcode_size))
         return trap_opcode_size;
 
     return 0;
 }
 

lldb/trunk/source/Target/Thread.cpp

if (m_unwinder_ap.get() == NULL)
         switch (machine)
         {
             case llvm::Triple::x86_64:
             case llvm::Triple::x86:
             case llvm::Triple::arm:
             case llvm::Triple::aarch64:
             case llvm::Triple::thumb:
             case llvm::Triple::mips64:
-            case llvm::Triple::ppc64:
             case llvm::Triple::ppc:
+            case llvm::Triple::ppc64:
             case llvm::Triple::hexagon:
                 m_unwinder_ap.reset (new UnwindLLDB (*this));
                 break;
                 
             default:
                 if (target_arch.GetTriple().getVendor() == llvm::Triple::Apple)
                     m_unwinder_ap.reset (new UnwindMacOSXFrameBackchain (*this));
                 break;

lldb/trunk/source/lldb.cpp

lldb_private::Terminate ()
     Timer scoped_timer (__PRETTY_FUNCTION__, __PRETTY_FUNCTION__);
     
     // Terminate and unload and loaded system or user LLDB plug-ins
     PluginManager::Terminate();
     ABIMacOSX_i386::Terminate();
     ABIMacOSX_arm::Terminate();
     ABIMacOSX_arm64::Terminate();
     ABISysV_x86_64::Terminate();
+    ABISysV_ppc::Terminate();
     ABISysV_ppc64::Terminate();
     DisassemblerLLVMC::Terminate();
     ObjectContainerBSDArchive::Terminate();
     ObjectFileELF::Terminate();
     SymbolVendorELF::Terminate();
     SymbolFileDWARF::Terminate();
     SymbolFileSymtab::Terminate();
     UnwindAssembly_x86::Terminate();