diff options
| -rw-r--r-- | lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp | 18 | ||||
| -rw-r--r-- | lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h | 24 |
2 files changed, 34 insertions, 8 deletions
diff --git a/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp b/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp index deb531d937a..debe01fce87 100644 --- a/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp +++ b/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp @@ -235,12 +235,22 @@ ABIMacOSX_i386::GetRedZoneSize () const ABISP ABIMacOSX_i386::CreateInstance (const ArchSpec &arch) { - static ABISP g_abi_sp; + static ABISP g_abi_mac_sp; + static ABISP g_abi_other_sp; if (arch.GetTriple().getArch() == llvm::Triple::x86) { - if (!g_abi_sp) - g_abi_sp.reset (new ABIMacOSX_i386); - return g_abi_sp; + if (arch.GetTriple().isOSDarwin()) + { + if (!g_abi_mac_sp) + g_abi_mac_sp.reset (new ABIMacOSX_i386(true)); + return g_abi_sp; + } + else + { + if (!g_abi_other_sp) + g_abi_other_sp.reset (new ABIMacOSX_i386(false)); + return g_abi_sp; + } } return ABISP(); } diff --git a/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h b/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h index 8c2d945e634..5428d0c1e44 100644 --- a/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h +++ b/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h @@ -79,9 +79,21 @@ public: virtual bool CallFrameAddressIsValid (lldb::addr_t cfa) { - // Make sure the stack call frame addresses are are 8 byte aligned - if (cfa & (8ull - 1ull)) - return false; // Not 8 byte aligned + // Darwin call frame addresses must be 16-byte aligned, but other OS's + // only need 4-byte alignment. Otherwise the ABI matches, so we have + // this one minor override here. + if (target_is_darwin) + { + // Make sure the stack call frame addresses are are 16 byte aligned + if (cfa & (16ull - 1ull)) + return false; // Not 16 byte aligned + } + else + { + // Make sure the stack call frame addresses are are 4 byte aligned + if (cfa & (4ull - 1ull)) + return false; // Not 4 byte aligned + } if (cfa == 0) return false; // Zero is not a valid stack address return true; @@ -132,7 +144,11 @@ protected: RegisterIsCalleeSaved (const lldb_private::RegisterInfo *reg_info); private: - ABIMacOSX_i386() : lldb_private::ABI() { } // Call CreateInstance instead. + ABIMacOSX_i386(bool is_darwin) : lldb_private::ABI(), + target_is_darwin(is_darwin) + { } // Call CreateInstance instead. + + bool target_is_darwin; }; |
