[Lldb-commits] [lldb] 10f16bc - Revert "[lldb] [ABI/X86] Split base x86 and i386 classes"

2021-10-06 Thread Stella Stamenova via lldb-commits 

Author: Stella Stamenova
Date: 2021-10-06T10:56:45-07:00
New Revision: 10f16bc7b2bfa0fb3589ac62fc8392854a3a2226

URL: 
https://github.com/llvm/llvm-project/commit/10f16bc7b2bfa0fb3589ac62fc8392854a3a2226
DIFF: 
https://github.com/llvm/llvm-project/commit/10f16bc7b2bfa0fb3589ac62fc8392854a3a2226.diff

LOG: Revert "[lldb] [ABI/X86] Split base x86 and i386 classes"

This change broke the windows lldb bot.

This reverts commit a30a36f66aea459337999a000c7997b220b25227.

Added: 


Modified: 
lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h
lldb/source/Plugins/ABI/X86/ABISysV_i386.h
lldb/source/Plugins/ABI/X86/ABIX86.cpp
lldb/source/Plugins/ABI/X86/ABIX86.h
lldb/source/Plugins/ABI/X86/ABIX86_64.h
lldb/source/Plugins/ABI/X86/CMakeLists.txt

Removed: 
lldb/source/Plugins/ABI/X86/ABIX86_i386.cpp
lldb/source/Plugins/ABI/X86/ABIX86_i386.h



diff  --git a/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h 
b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h
index 4c54645a6f95..a59e1b05a256 100644
--- a/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h
+++ b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h
@@ -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_i386.h"
+#include "Plugins/ABI/X86/ABIX86.h"
 #include "lldb/Core/Value.h"
 #include "lldb/lldb-private.h"
 
-class ABIMacOSX_i386 : public ABIX86_i386 {
+class ABIMacOSX_i386 : public ABIX86 {
 public:
   ~ABIMacOSX_i386() override = default;
 
@@ -92,7 +92,7 @@ class ABIMacOSX_i386 : public ABIX86_i386 {
   }
 
 private:
-  using ABIX86_i386::ABIX86_i386; // Call CreateInstance instead.
+  using ABIX86::ABIX86; // Call CreateInstance instead.
 };
 
 #endif // LLDB_SOURCE_PLUGINS_ABI_X86_ABIMACOSX_I386_H

diff  --git a/lldb/source/Plugins/ABI/X86/ABISysV_i386.h 
b/lldb/source/Plugins/ABI/X86/ABISysV_i386.h
index c3a584366b2a..651e467ad576 100644
--- a/lldb/source/Plugins/ABI/X86/ABISysV_i386.h
+++ b/lldb/source/Plugins/ABI/X86/ABISysV_i386.h
@@ -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_i386.h"
+#include "Plugins/ABI/X86/ABIX86.h"
 #include "lldb/lldb-private.h"
 
-class ABISysV_i386 : public ABIX86_i386 {
+class ABISysV_i386 : public ABIX86 {
 public:
   ~ABISysV_i386() override = default;
 
@@ -95,7 +95,7 @@ class ABISysV_i386 : public ABIX86_i386 {
   bool RegisterIsCalleeSaved(const lldb_private::RegisterInfo *reg_info);
 
 private:
-  using ABIX86_i386::ABIX86_i386; // Call CreateInstance instead.
+  using ABIX86::ABIX86; // Call CreateInstance instead.
 };
 
 #endif // LLDB_SOURCE_PLUGINS_ABI_X86_ABISYSV_I386_H

diff  --git a/lldb/source/Plugins/ABI/X86/ABIX86.cpp 
b/lldb/source/Plugins/ABI/X86/ABIX86.cpp
index c02680009e3e..bf5ab669417e 100644
--- a/lldb/source/Plugins/ABI/X86/ABIX86.cpp
+++ b/lldb/source/Plugins/ABI/X86/ABIX86.cpp
@@ -1,4 +1,4 @@
-//===-- ABIX86.cpp 
===//
+//===-- X86.h 
-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -28,3 +28,16 @@ void ABIX86::Terminate() {
   ABISysV_x86_64::Terminate();
   ABIWindows_x86_64::Terminate();
 }
+
+uint32_t ABIX86::GetGenericNum(llvm::StringRef name) {
+  return llvm::StringSwitch(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);
+}

diff  --git a/lldb/source/Plugins/ABI/X86/ABIX86.h 
b/lldb/source/Plugins/ABI/X86/ABIX86.h
index 2c25aac0bdc8..22521cacf180 100644
--- a/lldb/source/Plugins/ABI/X86/ABIX86.h
+++ b/lldb/source/Plugins/ABI/X86/ABIX86.h
@@ -1,4 +1,4 @@
-//===-- ABIX86.h *- C++ 
-*-===//
+//===-- X86.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

diff  --git a/lldb/source/Plugins/ABI/X86/ABIX86_64.h 
b/lldb/source/Plugins/

Re: [Lldb-commits] [lldb] 10f16bc - Revert "[lldb] [ABI/X86] Split base x86 and i386 classes"

2021-10-07 Thread Pavel Labath via lldb-commits 

On 06/10/2021 19:57, Stella Stamenova via lldb-commits wrote:


Author: Stella Stamenova
Date: 2021-10-06T10:56:45-07:00
New Revision: 10f16bc7b2bfa0fb3589ac62fc8392854a3a2226

URL: 
https://github.com/llvm/llvm-project/commit/10f16bc7b2bfa0fb3589ac62fc8392854a3a2226
DIFF: 
https://github.com/llvm/llvm-project/commit/10f16bc7b2bfa0fb3589ac62fc8392854a3a2226.diff

LOG: Revert "[lldb] [ABI/X86] Split base x86 and i386 classes"

This change broke the windows lldb bot.



Is there a plan to do something about the flakyness of that bot? 
Currently, it's success rate is like 80%. At that rate, people will 
train themselves to ignore it even if they do get a notification (which 
did not happen here because the previous build was a flake).


Maybe just disable the test step? Or just make the test step not fail 
the build (IIRC, buildbot has that option) ?


regards,
Pavel
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits