[Lldb-commits] [lldb] r312501 - [ABI] Rewrite RegisterIsCalleeSaved.

[Davide Italiano via lldb-commits]

Author: davide
Date: Mon Sep  4 14:21:12 2017
New Revision: 312501

URL: http://llvm.org/viewvc/llvm-project?rev=312501&view=rev
Log:
[ABI] Rewrite RegisterIsCalleeSaved.

The goal of this patch is twofold:
First, it removes a wrong comment (at least, not correctly describing
what the function does).
Then, it rewrites the function to use a StringSwitch where the
registers are enumerated explicitly instead of being computed
programmatically. Other than being much shorter, it's much easier to
read (and given the ABI won't change anytime soon, I don't think
there's need to generalize).

While here, I added an assert that the register name is always empty,
as the previous implementation of the function assumed so.

Differential Revision:  https://reviews.llvm.org/D37420

Modified:
lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp

Modified: lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp?rev=312501&r1=312500&r2=312501&view=diff
==
--- lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp Mon Sep  4 
14:21:12 2017
@@ -13,6 +13,7 @@
 // C++ Includes
 // Other libraries and framework includes
 #include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/StringSwitch.h"
 #include "llvm/ADT/Triple.h"
 
 // Project includes
@@ -1908,52 +1909,16 @@ bool ABISysV_x86_64::RegisterIsVolatile(
 // It's being revised & updated at https://github.com/hjl-tools/x86-psABI/
 
 bool ABISysV_x86_64::RegisterIsCalleeSaved(const RegisterInfo *reg_info) {
-  if (reg_info) {
-// Preserved registers are :
-//rbx, rsp, rbp, r12, r13, r14, r15
-//mxcsr (partially preserved)
-//x87 control word
-
-const char *name = reg_info->name;
-if (name[0] == 'r') {
-  switch (name[1]) {
-  case '1': // r12, r13, r14, r15
-if (name[2] >= '2' && name[2] <= '5')
-  return name[3] == '\0';
-break;
-
-  default:
-break;
-  }
-}
-
-// Accept shorter-variant versions, rbx/ebx, rip/ eip, etc.
-if (name[0] == 'r' || name[0] == 'e') {
-  switch (name[1]) {
-  case 'b': // rbp, rbx
-if (name[2] == 'p' || name[2] == 'x')
-  return name[3] == '\0';
-break;
-
-  case 'i': // rip
-if (name[2] == 'p')
-  return name[3] == '\0';
-break;
-
-  case 's': // rsp
-if (name[2] == 'p')
-  return name[3] == '\0';
-break;
-  }
-}
-if (name[0] == 's' && name[1] == 'p' && name[2] == '\0') // sp
-  return true;
-if (name[0] == 'f' && name[1] == 'p' && name[2] == '\0') // fp
-  return true;
-if (name[0] == 'p' && name[1] == 'c' && name[2] == '\0') // pc
-  return true;
-  }
-  return false;
+  if (!reg_info)
+return false;
+  assert(reg_info->name != nullptr && "unnamed register?");
+  std::string Name = std::string(reg_info->name);
+  bool IsCalleeSaved =
+  llvm::StringSwitch(Name)
+  .Cases("r12", "r13", "r14", "r15", "rbp", "ebp", "rbx", "ebx", true)
+  .Cases("rip", "eip", "rsp", "esp", "sp", "fp", "pc", true)
+  .Default(false);
+  return IsCalleeSaved;
 }
 
 void ABISysV_x86_64::Initialize() {


___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D37420: [ABI] Rewrite RegisterIsCalleeSaved

[Davide Italiano via Phabricator via lldb-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL312501: [ABI] Rewrite RegisterIsCalleeSaved. (authored by 
davide).

Changed prior to commit:
  https://reviews.llvm.org/D37420?vs=113675&id=113790#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D37420

Files:
  lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp


Index: lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
===
--- lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
+++ lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
@@ -13,6 +13,7 @@
 // C++ Includes
 // Other libraries and framework includes
 #include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/StringSwitch.h"
 #include "llvm/ADT/Triple.h"
 
 // Project includes
@@ -1908,52 +1909,16 @@
 // It's being revised & updated at https://github.com/hjl-tools/x86-psABI/
 
 bool ABISysV_x86_64::RegisterIsCalleeSaved(const RegisterInfo *reg_info) {
-  if (reg_info) {
-// Preserved registers are :
-//rbx, rsp, rbp, r12, r13, r14, r15
-//mxcsr (partially preserved)
-//x87 control word
-
-const char *name = reg_info->name;
-if (name[0] == 'r') {
-  switch (name[1]) {
-  case '1': // r12, r13, r14, r15
-if (name[2] >= '2' && name[2] <= '5')
-  return name[3] == '\0';
-break;
-
-  default:
-break;
-  }
-}
-
-// Accept shorter-variant versions, rbx/ebx, rip/ eip, etc.
-if (name[0] == 'r' || name[0] == 'e') {
-  switch (name[1]) {
-  case 'b': // rbp, rbx
-if (name[2] == 'p' || name[2] == 'x')
-  return name[3] == '\0';
-break;
-
-  case 'i': // rip
-if (name[2] == 'p')
-  return name[3] == '\0';
-break;
-
-  case 's': // rsp
-if (name[2] == 'p')
-  return name[3] == '\0';
-break;
-  }
-}
-if (name[0] == 's' && name[1] == 'p' && name[2] == '\0') // sp
-  return true;
-if (name[0] == 'f' && name[1] == 'p' && name[2] == '\0') // fp
-  return true;
-if (name[0] == 'p' && name[1] == 'c' && name[2] == '\0') // pc
-  return true;
-  }
-  return false;
+  if (!reg_info)
+return false;
+  assert(reg_info->name != nullptr && "unnamed register?");
+  std::string Name = std::string(reg_info->name);
+  bool IsCalleeSaved =
+  llvm::StringSwitch(Name)
+  .Cases("r12", "r13", "r14", "r15", "rbp", "ebp", "rbx", "ebx", true)
+  .Cases("rip", "eip", "rsp", "esp", "sp", "fp", "pc", true)
+  .Default(false);
+  return IsCalleeSaved;
 }
 
 void ABISysV_x86_64::Initialize() {


Index: lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
===
--- lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
+++ lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
@@ -13,6 +13,7 @@
 // C++ Includes
 // Other libraries and framework includes
 #include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/StringSwitch.h"
 #include "llvm/ADT/Triple.h"
 
 // Project includes
@@ -1908,52 +1909,16 @@
 // It's being revised & updated at https://github.com/hjl-tools/x86-psABI/
 
 bool ABISysV_x86_64::RegisterIsCalleeSaved(const RegisterInfo *reg_info) {
-  if (reg_info) {
-// Preserved registers are :
-//rbx, rsp, rbp, r12, r13, r14, r15
-//mxcsr (partially preserved)
-//x87 control word
-
-const char *name = reg_info->name;
-if (name[0] == 'r') {
-  switch (name[1]) {
-  case '1': // r12, r13, r14, r15
-if (name[2] >= '2' && name[2] <= '5')
-  return name[3] == '\0';
-break;
-
-  default:
-break;
-  }
-}
-
-// Accept shorter-variant versions, rbx/ebx, rip/ eip, etc.
-if (name[0] == 'r' || name[0] == 'e') {
-  switch (name[1]) {
-  case 'b': // rbp, rbx
-if (name[2] == 'p' || name[2] == 'x')
-  return name[3] == '\0';
-break;
-
-  case 'i': // rip
-if (name[2] == 'p')
-  return name[3] == '\0';
-break;
-
-  case 's': // rsp
-if (name[2] == 'p')
-  return name[3] == '\0';
-break;
-  }
-}
-if (name[0] == 's' && name[1] == 'p' && name[2] == '\0') // sp
-  return true;
-if (name[0] == 'f' && name[1] == 'p' && name[2] == '\0') // fp
-  return true;
-if (name[0] == 'p' && name[1] == 'c' && name[2] == '\0') // pc
-  return true;
-  }
-  return false;
+  if (!reg_info)
+return false;
+  assert(reg_info->name != nullptr && "unnamed register?");
+  std::string Name = std::string(reg_info->name);
+  bool IsCalleeSaved =
+  llvm::StringSwitch(Name)
+  .Cases("r12", "r13", "r14", "r15", "rbp", "ebp", "rbx", "ebx", true)
+  .Cases("rip", "eip", "rsp", "esp", "sp", "fp", "pc", true)
+  .Default(false);
+  return IsCalleeSaved;
 }
 
 void ABISysV_x86_64