Re: [PATCH] covoar/TargetBase: Rename branchInstructions to conditionalBranchInstructions

2021-03-11 Thread Gedare Bloom 
looks ok

On Thu, Mar 11, 2021 at 9:25 AM Alex White  wrote:
>
> The TargetBase class contains a member variable named
> branchInstructions. The name omits the fact that it is only meant to
> contain conditional branch instructions. Its name has been changed to
> conditionalBranchInstructions to avoid confusion.
> ---
>  tester/covoar/TargetBase.cc | 10 +++-
>  tester/covoar/TargetBase.h  |  4 +-
>  tester/covoar/Target_arm.cc | 34 ++--
>  tester/covoar/Target_i386.cc| 64 ++---
>  tester/covoar/Target_lm32.cc| 12 ++--
>  tester/covoar/Target_m68k.cc| 98 -
>  tester/covoar/Target_powerpc.cc | 56 +--
>  tester/covoar/Target_riscv.cc   | 22 
>  tester/covoar/Target_sparc.cc   | 66 +++---
>  9 files changed, 185 insertions(+), 181 deletions(-)
>
> diff --git a/tester/covoar/TargetBase.cc b/tester/covoar/TargetBase.cc
> index 354a580..4474fad 100644
> --- a/tester/covoar/TargetBase.cc
> +++ b/tester/covoar/TargetBase.cc
> @@ -66,15 +66,19 @@ namespace Target {
>{
>  std::list ::iterator i;
>
> -if (branchInstructions.empty()) {
> +if (conditionalBranchInstructions.empty()) {
>throw rld::error(
>  "DETERMINE BRANCH INSTRUCTIONS FOR THIS ARCHITECTURE! -- fix me",
>  "TargetBase::isBranch"
>);
>  }
>
> -i = find(branchInstructions.begin(), branchInstructions.end(), 
> instruction);
> -if ( i  == branchInstructions.end() )
> +i = find(
> +  conditionalBranchInstructions.begin(),
> +  conditionalBranchInstructions.end(),
> +  instruction
> +);
> +if ( i  == conditionalBranchInstructions.end() )
>return false;
>
>  return true;
> diff --git a/tester/covoar/TargetBase.h b/tester/covoar/TargetBase.h
> index 14cd6f2..e566c15 100644
> --- a/tester/covoar/TargetBase.h
> +++ b/tester/covoar/TargetBase.h
> @@ -135,10 +135,10 @@ namespace Target {
>  bool objdumpHasTabs;
>
>  /*!
> - * This member variable is an array of all branch instructions
> + * This member variable is an array of all conditional branch 
> instructions
>   * for this target.
>   */
> -std::list  branchInstructions;
> +std::list  conditionalBranchInstructions;
>
>private:
>
> diff --git a/tester/covoar/Target_arm.cc b/tester/covoar/Target_arm.cc
> index a33ec80..4b7b2e1 100644
> --- a/tester/covoar/Target_arm.cc
> +++ b/tester/covoar/Target_arm.cc
> @@ -19,24 +19,24 @@ namespace Target {
>Target_arm::Target_arm( std::string targetName ):
>  TargetBase( targetName )
>{
> -branchInstructions.push_back("bcc");
> -branchInstructions.push_back("bcs");
> -branchInstructions.push_back("beq");
> -branchInstructions.push_back("bge");
> -branchInstructions.push_back("bgt");
> -branchInstructions.push_back("bhi");
> -branchInstructions.push_back("bl-hi");
> -branchInstructions.push_back("bl-lo");
> -branchInstructions.push_back("ble");
> -branchInstructions.push_back("bls");
> -branchInstructions.push_back("blt");
> -branchInstructions.push_back("bmi");
> -branchInstructions.push_back("bne");
> -branchInstructions.push_back("bpl");
> -branchInstructions.push_back("bvc");
> -branchInstructions.push_back("bvs");
> +conditionalBranchInstructions.push_back("bcc");
> +conditionalBranchInstructions.push_back("bcs");
> +conditionalBranchInstructions.push_back("beq");
> +conditionalBranchInstructions.push_back("bge");
> +conditionalBranchInstructions.push_back("bgt");
> +conditionalBranchInstructions.push_back("bhi");
> +conditionalBranchInstructions.push_back("bl-hi");
> +conditionalBranchInstructions.push_back("bl-lo");
> +conditionalBranchInstructions.push_back("ble");
> +conditionalBranchInstructions.push_back("bls");
> +conditionalBranchInstructions.push_back("blt");
> +conditionalBranchInstructions.push_back("bmi");
> +conditionalBranchInstructions.push_back("bne");
> +conditionalBranchInstructions.push_back("bpl");
> +conditionalBranchInstructions.push_back("bvc");
> +conditionalBranchInstructions.push_back("bvs");
>
> -branchInstructions.sort();
> +conditionalBranchInstructions.sort();
>
>}
>
> diff --git a/tester/covoar/Target_i386.cc b/tester/covoar/Target_i386.cc
> index 0f82f18..e0c9c0f 100644
> --- a/tester/covoar/Target_i386.cc
> +++ b/tester/covoar/Target_i386.cc
> @@ -16,39 +16,39 @@ namespace Target {
>Target_i386::Target_i386( std::string targetName ):
>  TargetBase( targetName )
>{
> -branchInstructions.push_back("ja");
> -branchInstructions.push_back("jb");
> -branchInstructions.push_back("jc");
> -branchInstructions.push_back("je");
> -branchInstructions.push_back("jg");
> -branchInstructions.push_back("jl");
> -branchInstructions.push_back("jo");
> -branchInstructions.push_back("jp");
> -

[PATCH] covoar/TargetBase: Rename branchInstructions to conditionalBranchInstructions

2021-03-11 Thread Alex White 
The TargetBase class contains a member variable named
branchInstructions. The name omits the fact that it is only meant to
contain conditional branch instructions. Its name has been changed to
conditionalBranchInstructions to avoid confusion.
---
 tester/covoar/TargetBase.cc | 10 +++-
 tester/covoar/TargetBase.h  |  4 +-
 tester/covoar/Target_arm.cc | 34 ++--
 tester/covoar/Target_i386.cc| 64 ++---
 tester/covoar/Target_lm32.cc| 12 ++--
 tester/covoar/Target_m68k.cc| 98 -
 tester/covoar/Target_powerpc.cc | 56 +--
 tester/covoar/Target_riscv.cc   | 22 
 tester/covoar/Target_sparc.cc   | 66 +++---
 9 files changed, 185 insertions(+), 181 deletions(-)

diff --git a/tester/covoar/TargetBase.cc b/tester/covoar/TargetBase.cc
index 354a580..4474fad 100644
--- a/tester/covoar/TargetBase.cc
+++ b/tester/covoar/TargetBase.cc
@@ -66,15 +66,19 @@ namespace Target {
   {
 std::list ::iterator i;
 
-if (branchInstructions.empty()) {
+if (conditionalBranchInstructions.empty()) {
   throw rld::error(
 "DETERMINE BRANCH INSTRUCTIONS FOR THIS ARCHITECTURE! -- fix me",
 "TargetBase::isBranch"
   );
 }
 
-i = find(branchInstructions.begin(), branchInstructions.end(), 
instruction);
-if ( i  == branchInstructions.end() )
+i = find(
+  conditionalBranchInstructions.begin(),
+  conditionalBranchInstructions.end(),
+  instruction
+);
+if ( i  == conditionalBranchInstructions.end() )
   return false;
 
 return true;
diff --git a/tester/covoar/TargetBase.h b/tester/covoar/TargetBase.h
index 14cd6f2..e566c15 100644
--- a/tester/covoar/TargetBase.h
+++ b/tester/covoar/TargetBase.h
@@ -135,10 +135,10 @@ namespace Target {
 bool objdumpHasTabs;
 
 /*!
- * This member variable is an array of all branch instructions
+ * This member variable is an array of all conditional branch instructions
  * for this target.
  */
-std::list  branchInstructions;
+std::list  conditionalBranchInstructions;
 
   private:
 
diff --git a/tester/covoar/Target_arm.cc b/tester/covoar/Target_arm.cc
index a33ec80..4b7b2e1 100644
--- a/tester/covoar/Target_arm.cc
+++ b/tester/covoar/Target_arm.cc
@@ -19,24 +19,24 @@ namespace Target {
   Target_arm::Target_arm( std::string targetName ):
 TargetBase( targetName )
   {
-branchInstructions.push_back("bcc");
-branchInstructions.push_back("bcs");
-branchInstructions.push_back("beq");
-branchInstructions.push_back("bge");
-branchInstructions.push_back("bgt");
-branchInstructions.push_back("bhi");
-branchInstructions.push_back("bl-hi");
-branchInstructions.push_back("bl-lo");
-branchInstructions.push_back("ble");
-branchInstructions.push_back("bls");
-branchInstructions.push_back("blt");
-branchInstructions.push_back("bmi");
-branchInstructions.push_back("bne");
-branchInstructions.push_back("bpl");
-branchInstructions.push_back("bvc");
-branchInstructions.push_back("bvs");
+conditionalBranchInstructions.push_back("bcc");
+conditionalBranchInstructions.push_back("bcs");
+conditionalBranchInstructions.push_back("beq");
+conditionalBranchInstructions.push_back("bge");
+conditionalBranchInstructions.push_back("bgt");
+conditionalBranchInstructions.push_back("bhi");
+conditionalBranchInstructions.push_back("bl-hi");
+conditionalBranchInstructions.push_back("bl-lo");
+conditionalBranchInstructions.push_back("ble");
+conditionalBranchInstructions.push_back("bls");
+conditionalBranchInstructions.push_back("blt");
+conditionalBranchInstructions.push_back("bmi");
+conditionalBranchInstructions.push_back("bne");
+conditionalBranchInstructions.push_back("bpl");
+conditionalBranchInstructions.push_back("bvc");
+conditionalBranchInstructions.push_back("bvs");
 
-branchInstructions.sort();
+conditionalBranchInstructions.sort();
 
   }
 
diff --git a/tester/covoar/Target_i386.cc b/tester/covoar/Target_i386.cc
index 0f82f18..e0c9c0f 100644
--- a/tester/covoar/Target_i386.cc
+++ b/tester/covoar/Target_i386.cc
@@ -16,39 +16,39 @@ namespace Target {
   Target_i386::Target_i386( std::string targetName ):
 TargetBase( targetName )
   {
-branchInstructions.push_back("ja");
-branchInstructions.push_back("jb");
-branchInstructions.push_back("jc");
-branchInstructions.push_back("je");
-branchInstructions.push_back("jg");
-branchInstructions.push_back("jl");
-branchInstructions.push_back("jo");
-branchInstructions.push_back("jp");
-branchInstructions.push_back("js");
-branchInstructions.push_back("jz");
-branchInstructions.push_back("jae");
-branchInstructions.push_back("jbe");
-branchInstructions.push_back("jge");
-branchInstructions.push_back("jle");
-branchInstructions.push_back("jne");
-