Empathy List Archives

gem5-dev@gem5.org

The gem5 Developer List

View all threads

[M] Change in gem5/gem5[develop]: arch-arm: Group self hosted debug writes in ISA switch

Giacomo Travaglini (Gerrit)

Wed, May 17, 2023 8:11 AM

Giacomo Travaglini has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/70562?usp=email )

(

1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: arch-arm: Group self hosted debug writes in ISA switch
......................................................................

arch-arm: Group self hosted debug writes in ISA switch

Change-Id: If9c0675743856b603e7b5ec1898f5cdd650f3ce6
Signed-off-by: Giacomo Travaglini giacomo.travaglini@arm.com
Reviewed-by: Richard Cooper richard.cooper@arm.com
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/70562
Tested-by: kokoro noreply+kokoro@google.com
Maintainer: Jason Lowe-Power power.jg@gmail.com

M src/arch/arm/isa.cc
1 file changed, 8 insertions(+), 188 deletions(-)

Approvals:
Jason Lowe-Power: Looks good to me, approved
Richard Cooper: Looks good to me, approved
kokoro: Regressions pass

diff --git a/src/arch/arm/isa.cc b/src/arch/arm/isa.cc
index 7df8978..bef2db5 100644
--- a/src/arch/arm/isa.cc
+++ b/src/arch/arm/isa.cc
@@ -962,101 +962,11 @@
tc->setMiscReg(MISCREG_DBGOSLSR, r);
}
break;

```
     case MISCREG_DBGBCR0:
```

       selfDebug->updateDBGBCR(0, val);

     case MISCREG_DBGBCR0 ... MISCREG_DBGBCR15:

       selfDebug->updateDBGBCR(idx - MISCREG_DBGBCR0, val);
        break;

```
     case MISCREG_DBGBCR1:
```

       selfDebug->updateDBGBCR(1, val);

```
       break;
```
```
     case MISCREG_DBGBCR2:
```

       selfDebug->updateDBGBCR(2, val);

```
       break;
```
```
     case MISCREG_DBGBCR3:
```

       selfDebug->updateDBGBCR(3, val);

```
       break;
```
```
     case MISCREG_DBGBCR4:
```

       selfDebug->updateDBGBCR(4, val);

```
       break;
```
```
     case MISCREG_DBGBCR5:
```

       selfDebug->updateDBGBCR(5, val);

```
       break;
```
```
     case MISCREG_DBGBCR6:
```

       selfDebug->updateDBGBCR(6, val);

```
       break;
```
```
     case MISCREG_DBGBCR7:
```

       selfDebug->updateDBGBCR(7, val);

```
       break;
```
```
     case MISCREG_DBGBCR8:
```

       selfDebug->updateDBGBCR(8, val);

```
       break;
```
```
     case MISCREG_DBGBCR9:
```

       selfDebug->updateDBGBCR(9, val);

```
       break;
```
```
     case MISCREG_DBGBCR10:
```

       selfDebug->updateDBGBCR(10, val);

```
       break;
```
```
     case MISCREG_DBGBCR11:
```

       selfDebug->updateDBGBCR(11, val);

```
       break;
```
```
     case MISCREG_DBGBCR12:
```

       selfDebug->updateDBGBCR(12, val);

```
       break;
```
```
     case MISCREG_DBGBCR13:
```

       selfDebug->updateDBGBCR(13, val);

```
       break;
```
```
     case MISCREG_DBGBCR14:
```

       selfDebug->updateDBGBCR(14, val);

```
       break;
```
```
     case MISCREG_DBGBCR15:
```

       selfDebug->updateDBGBCR(15, val);

```
       break;
```
```
     case MISCREG_DBGWCR0:
```

       selfDebug->updateDBGWCR(0, val);

```
       break;
```
```
     case MISCREG_DBGWCR1:
```

       selfDebug->updateDBGWCR(1, val);

```
       break;
```
```
     case MISCREG_DBGWCR2:
```

       selfDebug->updateDBGWCR(2, val);

```
       break;
```
```
     case MISCREG_DBGWCR3:
```

       selfDebug->updateDBGWCR(3, val);

```
       break;
```
```
     case MISCREG_DBGWCR4:
```

       selfDebug->updateDBGWCR(4, val);

```
       break;
```
```
     case MISCREG_DBGWCR5:
```

       selfDebug->updateDBGWCR(5, val);

```
       break;
```
```
     case MISCREG_DBGWCR6:
```

       selfDebug->updateDBGWCR(6, val);

```
       break;
```
```
     case MISCREG_DBGWCR7:
```

       selfDebug->updateDBGWCR(7, val);

```
       break;
```
```
     case MISCREG_DBGWCR8:
```

       selfDebug->updateDBGWCR(8, val);

```
       break;
```
```
     case MISCREG_DBGWCR9:
```

       selfDebug->updateDBGWCR(9, val);

```
       break;
```
```
     case MISCREG_DBGWCR10:
```

       selfDebug->updateDBGWCR(10, val);

```
       break;
```
```
     case MISCREG_DBGWCR11:
```

       selfDebug->updateDBGWCR(11, val);

```
       break;
```
```
     case MISCREG_DBGWCR12:
```

       selfDebug->updateDBGWCR(12, val);

```
       break;
```
```
     case MISCREG_DBGWCR13:
```

       selfDebug->updateDBGWCR(13, val);

```
       break;
```
```
     case MISCREG_DBGWCR14:
```

       selfDebug->updateDBGWCR(14, val);

```
       break;
```
```
     case MISCREG_DBGWCR15:
```

       selfDebug->updateDBGWCR(15, val);

     case MISCREG_DBGWCR0 ... MISCREG_DBGWCR15:

       selfDebug->updateDBGWCR(idx - MISCREG_DBGWCR0, val);
        break;

      case MISCREG_MDCR_EL2:

@@ -1100,101 +1010,11 @@
}
break;

```
     case MISCREG_DBGBCR0_EL1:
```

       selfDebug->updateDBGBCR(0, val);

     case MISCREG_DBGBCR0_EL1 ... MISCREG_DBGBCR15_EL1:

       selfDebug->updateDBGBCR(idx - MISCREG_DBGBCR0_EL1, val);
        break;

```
     case MISCREG_DBGBCR1_EL1:
```

       selfDebug->updateDBGBCR(1, val);

```
       break;
```
```
     case MISCREG_DBGBCR2_EL1:
```

       selfDebug->updateDBGBCR(2, val);

```
       break;
```
```
     case MISCREG_DBGBCR3_EL1:
```

       selfDebug->updateDBGBCR(3, val);

```
       break;
```
```
     case MISCREG_DBGBCR4_EL1:
```

       selfDebug->updateDBGBCR(4, val);

```
       break;
```
```
     case MISCREG_DBGBCR5_EL1:
```

       selfDebug->updateDBGBCR(5, val);

```
       break;
```
```
     case MISCREG_DBGBCR6_EL1:
```

       selfDebug->updateDBGBCR(6, val);

```
       break;
```
```
     case MISCREG_DBGBCR7_EL1:
```

       selfDebug->updateDBGBCR(7, val);

```
       break;
```
```
     case MISCREG_DBGBCR8_EL1:
```

       selfDebug->updateDBGBCR(8, val);

```
       break;
```
```
     case MISCREG_DBGBCR9_EL1:
```

       selfDebug->updateDBGBCR(9, val);

```
       break;
```
```
     case MISCREG_DBGBCR10_EL1:
```

       selfDebug->updateDBGBCR(10, val);

```
       break;
```
```
     case MISCREG_DBGBCR11_EL1:
```

       selfDebug->updateDBGBCR(11, val);

```
       break;
```
```
     case MISCREG_DBGBCR12_EL1:
```

       selfDebug->updateDBGBCR(12, val);

```
       break;
```
```
     case MISCREG_DBGBCR13_EL1:
```

       selfDebug->updateDBGBCR(13, val);

```
       break;
```
```
     case MISCREG_DBGBCR14_EL1:
```

       selfDebug->updateDBGBCR(14, val);

```
       break;
```
```
     case MISCREG_DBGBCR15_EL1:
```

       selfDebug->updateDBGBCR(15, val);

```
       break;
```
```
     case MISCREG_DBGWCR0_EL1:
```

       selfDebug->updateDBGWCR(0, val);

```
       break;
```
```
     case MISCREG_DBGWCR1_EL1:
```

       selfDebug->updateDBGWCR(1, val);

```
       break;
```
```
     case MISCREG_DBGWCR2_EL1:
```

       selfDebug->updateDBGWCR(2, val);

```
       break;
```
```
     case MISCREG_DBGWCR3_EL1:
```

       selfDebug->updateDBGWCR(3, val);

```
       break;
```
```
     case MISCREG_DBGWCR4_EL1:
```

       selfDebug->updateDBGWCR(4, val);

```
       break;
```
```
     case MISCREG_DBGWCR5_EL1:
```

       selfDebug->updateDBGWCR(5, val);

```
       break;
```
```
     case MISCREG_DBGWCR6_EL1:
```

       selfDebug->updateDBGWCR(6, val);

```
       break;
```
```
     case MISCREG_DBGWCR7_EL1:
```

       selfDebug->updateDBGWCR(7, val);

```
       break;
```
```
     case MISCREG_DBGWCR8_EL1:
```

       selfDebug->updateDBGWCR(8, val);

```
       break;
```
```
     case MISCREG_DBGWCR9_EL1:
```

       selfDebug->updateDBGWCR(9, val);

```
       break;
```
```
     case MISCREG_DBGWCR10_EL1:
```

       selfDebug->updateDBGWCR(10, val);

```
       break;
```
```
     case MISCREG_DBGWCR11_EL1:
```

       selfDebug->updateDBGWCR(11, val);

```
       break;
```
```
     case MISCREG_DBGWCR12_EL1:
```

       selfDebug->updateDBGWCR(12, val);

```
       break;
```
```
     case MISCREG_DBGWCR13_EL1:
```

       selfDebug->updateDBGWCR(13, val);

```
       break;
```
```
     case MISCREG_DBGWCR14_EL1:
```

       selfDebug->updateDBGWCR(14, val);

```
       break;
```
```
     case MISCREG_DBGWCR15_EL1:
```

       selfDebug->updateDBGWCR(15, val);

     case MISCREG_DBGWCR0_EL1 ... MISCREG_DBGWCR15_EL1:

       selfDebug->updateDBGWCR(idx - MISCREG_DBGWCR0_EL1, val);
        break;
      case MISCREG_IFSR:
        {

--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/70562?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings?usp=email

Gerrit-MessageType: merged
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: If9c0675743856b603e7b5ec1898f5cdd650f3ce6
Gerrit-Change-Number: 70562
Gerrit-PatchSet: 3
Gerrit-Owner: Giacomo Travaglini giacomo.travaglini@arm.com
Gerrit-Reviewer: Andreas Sandberg andreas.sandberg@arm.com
Gerrit-Reviewer: Giacomo Travaglini giacomo.travaglini@arm.com
Gerrit-Reviewer: Jason Lowe-Power power.jg@gmail.com
Gerrit-Reviewer: Richard Cooper richard.cooper@arm.com
Gerrit-Reviewer: kokoro noreply+kokoro@google.com

Giacomo Travaglini has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/70562?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: arch-arm: Group self hosted debug writes in ISA switch ...................................................................... arch-arm: Group self hosted debug writes in ISA switch Change-Id: If9c0675743856b603e7b5ec1898f5cdd650f3ce6 Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Reviewed-by: Richard Cooper <richard.cooper@arm.com> Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/70562 Tested-by: kokoro <noreply+kokoro@google.com> Maintainer: Jason Lowe-Power <power.jg@gmail.com> --- M src/arch/arm/isa.cc 1 file changed, 8 insertions(+), 188 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, approved Richard Cooper: Looks good to me, approved kokoro: Regressions pass diff --git a/src/arch/arm/isa.cc b/src/arch/arm/isa.cc index 7df8978..bef2db5 100644 --- a/src/arch/arm/isa.cc +++ b/src/arch/arm/isa.cc @@ -962,101 +962,11 @@ tc->setMiscReg(MISCREG_DBGOSLSR, r); } break; - case MISCREG_DBGBCR0: - selfDebug->updateDBGBCR(0, val); + case MISCREG_DBGBCR0 ... MISCREG_DBGBCR15: + selfDebug->updateDBGBCR(idx - MISCREG_DBGBCR0, val); break; - case MISCREG_DBGBCR1: - selfDebug->updateDBGBCR(1, val); - break; - case MISCREG_DBGBCR2: - selfDebug->updateDBGBCR(2, val); - break; - case MISCREG_DBGBCR3: - selfDebug->updateDBGBCR(3, val); - break; - case MISCREG_DBGBCR4: - selfDebug->updateDBGBCR(4, val); - break; - case MISCREG_DBGBCR5: - selfDebug->updateDBGBCR(5, val); - break; - case MISCREG_DBGBCR6: - selfDebug->updateDBGBCR(6, val); - break; - case MISCREG_DBGBCR7: - selfDebug->updateDBGBCR(7, val); - break; - case MISCREG_DBGBCR8: - selfDebug->updateDBGBCR(8, val); - break; - case MISCREG_DBGBCR9: - selfDebug->updateDBGBCR(9, val); - break; - case MISCREG_DBGBCR10: - selfDebug->updateDBGBCR(10, val); - break; - case MISCREG_DBGBCR11: - selfDebug->updateDBGBCR(11, val); - break; - case MISCREG_DBGBCR12: - selfDebug->updateDBGBCR(12, val); - break; - case MISCREG_DBGBCR13: - selfDebug->updateDBGBCR(13, val); - break; - case MISCREG_DBGBCR14: - selfDebug->updateDBGBCR(14, val); - break; - case MISCREG_DBGBCR15: - selfDebug->updateDBGBCR(15, val); - break; - case MISCREG_DBGWCR0: - selfDebug->updateDBGWCR(0, val); - break; - case MISCREG_DBGWCR1: - selfDebug->updateDBGWCR(1, val); - break; - case MISCREG_DBGWCR2: - selfDebug->updateDBGWCR(2, val); - break; - case MISCREG_DBGWCR3: - selfDebug->updateDBGWCR(3, val); - break; - case MISCREG_DBGWCR4: - selfDebug->updateDBGWCR(4, val); - break; - case MISCREG_DBGWCR5: - selfDebug->updateDBGWCR(5, val); - break; - case MISCREG_DBGWCR6: - selfDebug->updateDBGWCR(6, val); - break; - case MISCREG_DBGWCR7: - selfDebug->updateDBGWCR(7, val); - break; - case MISCREG_DBGWCR8: - selfDebug->updateDBGWCR(8, val); - break; - case MISCREG_DBGWCR9: - selfDebug->updateDBGWCR(9, val); - break; - case MISCREG_DBGWCR10: - selfDebug->updateDBGWCR(10, val); - break; - case MISCREG_DBGWCR11: - selfDebug->updateDBGWCR(11, val); - break; - case MISCREG_DBGWCR12: - selfDebug->updateDBGWCR(12, val); - break; - case MISCREG_DBGWCR13: - selfDebug->updateDBGWCR(13, val); - break; - case MISCREG_DBGWCR14: - selfDebug->updateDBGWCR(14, val); - break; - case MISCREG_DBGWCR15: - selfDebug->updateDBGWCR(15, val); + case MISCREG_DBGWCR0 ... MISCREG_DBGWCR15: + selfDebug->updateDBGWCR(idx - MISCREG_DBGWCR0, val); break; case MISCREG_MDCR_EL2: @@ -1100,101 +1010,11 @@ } break; - case MISCREG_DBGBCR0_EL1: - selfDebug->updateDBGBCR(0, val); + case MISCREG_DBGBCR0_EL1 ... MISCREG_DBGBCR15_EL1: + selfDebug->updateDBGBCR(idx - MISCREG_DBGBCR0_EL1, val); break; - case MISCREG_DBGBCR1_EL1: - selfDebug->updateDBGBCR(1, val); - break; - case MISCREG_DBGBCR2_EL1: - selfDebug->updateDBGBCR(2, val); - break; - case MISCREG_DBGBCR3_EL1: - selfDebug->updateDBGBCR(3, val); - break; - case MISCREG_DBGBCR4_EL1: - selfDebug->updateDBGBCR(4, val); - break; - case MISCREG_DBGBCR5_EL1: - selfDebug->updateDBGBCR(5, val); - break; - case MISCREG_DBGBCR6_EL1: - selfDebug->updateDBGBCR(6, val); - break; - case MISCREG_DBGBCR7_EL1: - selfDebug->updateDBGBCR(7, val); - break; - case MISCREG_DBGBCR8_EL1: - selfDebug->updateDBGBCR(8, val); - break; - case MISCREG_DBGBCR9_EL1: - selfDebug->updateDBGBCR(9, val); - break; - case MISCREG_DBGBCR10_EL1: - selfDebug->updateDBGBCR(10, val); - break; - case MISCREG_DBGBCR11_EL1: - selfDebug->updateDBGBCR(11, val); - break; - case MISCREG_DBGBCR12_EL1: - selfDebug->updateDBGBCR(12, val); - break; - case MISCREG_DBGBCR13_EL1: - selfDebug->updateDBGBCR(13, val); - break; - case MISCREG_DBGBCR14_EL1: - selfDebug->updateDBGBCR(14, val); - break; - case MISCREG_DBGBCR15_EL1: - selfDebug->updateDBGBCR(15, val); - break; - case MISCREG_DBGWCR0_EL1: - selfDebug->updateDBGWCR(0, val); - break; - case MISCREG_DBGWCR1_EL1: - selfDebug->updateDBGWCR(1, val); - break; - case MISCREG_DBGWCR2_EL1: - selfDebug->updateDBGWCR(2, val); - break; - case MISCREG_DBGWCR3_EL1: - selfDebug->updateDBGWCR(3, val); - break; - case MISCREG_DBGWCR4_EL1: - selfDebug->updateDBGWCR(4, val); - break; - case MISCREG_DBGWCR5_EL1: - selfDebug->updateDBGWCR(5, val); - break; - case MISCREG_DBGWCR6_EL1: - selfDebug->updateDBGWCR(6, val); - break; - case MISCREG_DBGWCR7_EL1: - selfDebug->updateDBGWCR(7, val); - break; - case MISCREG_DBGWCR8_EL1: - selfDebug->updateDBGWCR(8, val); - break; - case MISCREG_DBGWCR9_EL1: - selfDebug->updateDBGWCR(9, val); - break; - case MISCREG_DBGWCR10_EL1: - selfDebug->updateDBGWCR(10, val); - break; - case MISCREG_DBGWCR11_EL1: - selfDebug->updateDBGWCR(11, val); - break; - case MISCREG_DBGWCR12_EL1: - selfDebug->updateDBGWCR(12, val); - break; - case MISCREG_DBGWCR13_EL1: - selfDebug->updateDBGWCR(13, val); - break; - case MISCREG_DBGWCR14_EL1: - selfDebug->updateDBGWCR(14, val); - break; - case MISCREG_DBGWCR15_EL1: - selfDebug->updateDBGWCR(15, val); + case MISCREG_DBGWCR0_EL1 ... MISCREG_DBGWCR15_EL1: + selfDebug->updateDBGWCR(idx - MISCREG_DBGWCR0_EL1, val); break; case MISCREG_IFSR: { -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/70562?usp=email To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: public/gem5 Gerrit-Branch: develop Gerrit-Change-Id: If9c0675743856b603e7b5ec1898f5cdd650f3ce6 Gerrit-Change-Number: 70562 Gerrit-PatchSet: 3 Gerrit-Owner: Giacomo Travaglini <giacomo.travaglini@arm.com> Gerrit-Reviewer: Andreas Sandberg <andreas.sandberg@arm.com> Gerrit-Reviewer: Giacomo Travaglini <giacomo.travaglini@arm.com> Gerrit-Reviewer: Jason Lowe-Power <power.jg@gmail.com> Gerrit-Reviewer: Richard Cooper <richard.cooper@arm.com> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com>