Commit a30a36f6 authored by Michał Górny's avatar Michał Górny
Browse files

[lldb] [ABI/X86] Split base x86 and i386 classes 

Split the ABIX86 class into two classes: base ABIX86 class that is
common to 32-bit and 64-bit ABIs, and ABIX86_i386 class that is the base
for 32-bit ABIs.  This removes the confusing concept that ABIX86
initializes 64-bit ABIs but is only the base for 32-bit ABIs.

Differential Revision: https://reviews.llvm.org/D111216
parent e244a6fe

lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h

+3 −3
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ 
#ifndef LLDB_SOURCE_PLUGINS_ABI_X86_ABIMACOSX_I386_H

#define LLDB_SOURCE_PLUGINS_ABI_X86_ABIMACOSX_I386_H



#include "Plugins/ABI/X86/ABIX86.h"

#include "Plugins/ABI/X86/ABIX86_i386.h"

#include "lldb/Core/Value.h"

#include "lldb/lldb-private.h"



class ABIMacOSX_i386 : public ABIX86 {

class ABIMacOSX_i386 : public ABIX86_i386 {

public:

  ~ABIMacOSX_i386() override = default;
@@ -92,7 +92,7 @@ protected: 
  }



private:

  using ABIX86::ABIX86; // Call CreateInstance instead.

  using ABIX86_i386::ABIX86_i386; // Call CreateInstance instead.

};



#endif // LLDB_SOURCE_PLUGINS_ABI_X86_ABIMACOSX_I386_H

lldb/source/Plugins/ABI/X86/ABISysV_i386.h

+3 −3
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ 
#ifndef LLDB_SOURCE_PLUGINS_ABI_X86_ABISYSV_I386_H

#define LLDB_SOURCE_PLUGINS_ABI_X86_ABISYSV_I386_H



#include "Plugins/ABI/X86/ABIX86.h"

#include "Plugins/ABI/X86/ABIX86_i386.h"

#include "lldb/lldb-private.h"



class ABISysV_i386 : public ABIX86 {

class ABISysV_i386 : public ABIX86_i386 {

public:

  ~ABISysV_i386() override = default;
@@ -95,7 +95,7 @@ protected: 
  bool RegisterIsCalleeSaved(const lldb_private::RegisterInfo *reg_info);



private:

  using ABIX86::ABIX86; // Call CreateInstance instead.

  using ABIX86_i386::ABIX86_i386; // Call CreateInstance instead.

};



#endif // LLDB_SOURCE_PLUGINS_ABI_X86_ABISYSV_I386_H

lldb/source/Plugins/ABI/X86/ABIX86.cpp

+1 −14
Original line number Diff line number Diff line 
//===-- X86.h -------------------------------------------------------------===//

//===-- ABIX86.cpp --------------------------------------------------------===//

//

// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

// See https://llvm.org/LICENSE.txt for license information.
@@ -28,16 +28,3 @@ void ABIX86::Terminate() { 
  ABISysV_x86_64::Terminate();

  ABIWindows_x86_64::Terminate();

}
 


uint32_t ABIX86::GetGenericNum(llvm::StringRef name) {

  return llvm::StringSwitch<uint32_t>(name)

      .Case("eip", LLDB_REGNUM_GENERIC_PC)

      .Case("esp", LLDB_REGNUM_GENERIC_SP)

      .Case("ebp", LLDB_REGNUM_GENERIC_FP)

      .Case("eflags", LLDB_REGNUM_GENERIC_FLAGS)

      .Case("edi", LLDB_REGNUM_GENERIC_ARG1)

      .Case("esi", LLDB_REGNUM_GENERIC_ARG2)

      .Case("edx", LLDB_REGNUM_GENERIC_ARG3)

      .Case("ecx", LLDB_REGNUM_GENERIC_ARG4)

      .Default(LLDB_INVALID_REGNUM);

}

lldb/source/Plugins/ABI/X86/ABIX86.h

+3 −3
Original line number Diff line number Diff line 
//===-- X86.h ---------------------------------------------------*- C++ -*-===//

//===-- ABIX86.h ------------------------------------------------*- C++ -*-===//

//

// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

// See https://llvm.org/LICENSE.txt for license information.
@@ -10,15 +10,15 @@ 
#define LLDB_SOURCE_PLUGINS_ABI_X86_ABIX86_H



#include "lldb/Target/ABI.h"

#include "lldb/lldb-private.h"



class ABIX86 : public lldb_private::MCBasedABI {

public:

  static void Initialize();

  static void Terminate();



  uint32_t GetGenericNum(llvm::StringRef name) override;



private:

  using lldb_private::MCBasedABI::MCBasedABI;

};



#endif

lldb/source/Plugins/ABI/X86/ABIX86_64.h

+6 −4
Original line number Diff line number Diff line
@@ -9,10 +9,12 @@ 
#ifndef LLDB_SOURCE_PLUGINS_ABI_X86_ABIX86_64_H

#define LLDB_SOURCE_PLUGINS_ABI_X86_ABIX86_64_H



#include "lldb/Target/ABI.h"

#include "lldb/lldb-private.h"

#include "Plugins/ABI/X86/ABIX86.h"



class ABIX86_64 : public ABIX86 {

public:

  uint32_t GetGenericNum(llvm::StringRef name) override;



class ABIX86_64 : public lldb_private::MCBasedABI {

protected:

  std::string GetMCName(std::string name) override {

    MapRegisterName(name, "stmm", "st");
@@ -20,7 +22,7 @@ protected: 
  }



private:

  using lldb_private::MCBasedABI::MCBasedABI;

  using ABIX86::ABIX86;

};



#endif // LLDB_SOURCE_PLUGINS_ABI_X86_ABIX86_64_H