diff options
| author | Ben Gass <bgass@us.ibm.com> | 2016-02-24 08:45:31 -0600 |
|---|---|---|
| committer | Joshua Hunsberger <jahunsbe@us.ibm.com> | 2017-10-23 15:58:07 -0500 |
| commit | c5a589645ce3d4c0a7e6e3ec2695175007c51f7a (patch) | |
| tree | 7bc25401ab6a655df455d84233fc623efcd26955 /import/chips/p9/common/include | |
| parent | e7823d55eba324c37a2e3bbf655a8138a82c2b96 (diff) | |
| download | talos-hcode-c5a589645ce3d4c0a7e6e3ec2695175007c51f7a.tar.gz talos-hcode-c5a589645ce3d4c0a7e6e3ec2695175007c51f7a.zip | |
New 9034 release with corrected ex scom rings
Change-Id: I9e7f27b961bbd57e66383031b6928a96fe41a281
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/24710
Tested-by: Jenkins Server
Tested-by: Auto Mirror
Tested-by: PPE CI
Tested-by: Hostboot CI
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Diffstat (limited to 'import/chips/p9/common/include')
| -rw-r--r-- | import/chips/p9/common/include/p9_quad_scom_addresses.H | 2374 | ||||
| -rw-r--r-- | import/chips/p9/common/include/p9_quad_scom_addresses_fld.H | 872 | ||||
| -rw-r--r-- | import/chips/p9/common/include/p9_reg2constmap.txt | 110 | ||||
| -rw-r--r-- | import/chips/p9/common/include/p9_scom_template_consts.H | 470 |
4 files changed, 2086 insertions, 1740 deletions
diff --git a/import/chips/p9/common/include/p9_quad_scom_addresses.H b/import/chips/p9/common/include/p9_quad_scom_addresses.H index 4a57fb58..716d3319 100644 --- a/import/chips/p9/common/include/p9_quad_scom_addresses.H +++ b/import/chips/p9/common/include/p9_quad_scom_addresses.H @@ -1046,85 +1046,91 @@ REG64( EX_CME_LCL_EIMR_PPE1 , RULL(0x10901003 SH_ACS_PPE1 ); REG64( EX_CME_LCL_EIMR_PPE2 , RULL(0x109010030), SH_UNT_EX , SH_ACS_PPE2 ); -REG64( EX_CME_LCL_EIMR_SCOM , RULL(0x10012426), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_LCL_EIMR_SCOM , RULL(0x10012026), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_LCL_EIMR_PPE , RULL(0x109010020), SH_UNT_EX_0 , SH_ACS_PPE ); REG64( EX_0_CME_LCL_EIMR_PPE1 , RULL(0x109010038), SH_UNT_EX_0 , SH_ACS_PPE1 ); REG64( EX_0_CME_LCL_EIMR_PPE2 , RULL(0x109010030), SH_UNT_EX_0 , SH_ACS_PPE2 ); -REG64( EX_0_CME_LCL_EIMR_SCOM , RULL(0x10012426), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_LCL_EIMR_SCOM , RULL(0x10012026), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_LCL_EIMR_PPE , RULL(0x109020020), SH_UNT_EX_1 , SH_ACS_PPE ); REG64( EX_1_CME_LCL_EIMR_PPE1 , RULL(0x109020038), SH_UNT_EX_1 , SH_ACS_PPE1 ); REG64( EX_1_CME_LCL_EIMR_PPE2 , RULL(0x109020030), SH_UNT_EX_1 , SH_ACS_PPE2 ); +REG64( EX_1_CME_LCL_EIMR_SCOM , RULL(0x10012426), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_LCL_EIMR_PPE , RULL(0x10A010020), SH_UNT_EX_2 , SH_ACS_PPE ); REG64( EX_2_CME_LCL_EIMR_PPE1 , RULL(0x10A010038), SH_UNT_EX_2 , SH_ACS_PPE1 ); REG64( EX_2_CME_LCL_EIMR_PPE2 , RULL(0x10A010030), SH_UNT_EX_2 , SH_ACS_PPE2 ); -REG64( EX_2_CME_LCL_EIMR_SCOM , RULL(0x11012426), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_LCL_EIMR_SCOM , RULL(0x11012026), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_LCL_EIMR_PPE , RULL(0x10A020020), SH_UNT_EX_3 , SH_ACS_PPE ); REG64( EX_3_CME_LCL_EIMR_PPE1 , RULL(0x10A020038), SH_UNT_EX_3 , SH_ACS_PPE1 ); REG64( EX_3_CME_LCL_EIMR_PPE2 , RULL(0x10A020030), SH_UNT_EX_3 , SH_ACS_PPE2 ); +REG64( EX_3_CME_LCL_EIMR_SCOM , RULL(0x11012426), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_LCL_EIMR_PPE , RULL(0x10B010020), SH_UNT_EX_4 , SH_ACS_PPE ); REG64( EX_4_CME_LCL_EIMR_PPE1 , RULL(0x10B010038), SH_UNT_EX_4 , SH_ACS_PPE1 ); REG64( EX_4_CME_LCL_EIMR_PPE2 , RULL(0x10B010030), SH_UNT_EX_4 , SH_ACS_PPE2 ); -REG64( EX_4_CME_LCL_EIMR_SCOM , RULL(0x12012426), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_LCL_EIMR_SCOM , RULL(0x12012026), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_LCL_EIMR_PPE , RULL(0x10B020020), SH_UNT_EX_5 , SH_ACS_PPE ); REG64( EX_5_CME_LCL_EIMR_PPE1 , RULL(0x10B020038), SH_UNT_EX_5 , SH_ACS_PPE1 ); REG64( EX_5_CME_LCL_EIMR_PPE2 , RULL(0x10B020030), SH_UNT_EX_5 , SH_ACS_PPE2 ); +REG64( EX_5_CME_LCL_EIMR_SCOM , RULL(0x12012426), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_LCL_EIMR_PPE , RULL(0x10C010020), SH_UNT_EX_6 , SH_ACS_PPE ); REG64( EX_6_CME_LCL_EIMR_PPE1 , RULL(0x10C010038), SH_UNT_EX_6 , SH_ACS_PPE1 ); REG64( EX_6_CME_LCL_EIMR_PPE2 , RULL(0x10C010030), SH_UNT_EX_6 , SH_ACS_PPE2 ); -REG64( EX_6_CME_LCL_EIMR_SCOM , RULL(0x13012426), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_LCL_EIMR_SCOM , RULL(0x13012026), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_LCL_EIMR_PPE , RULL(0x10C020020), SH_UNT_EX_7 , SH_ACS_PPE ); REG64( EX_7_CME_LCL_EIMR_PPE1 , RULL(0x10C020038), SH_UNT_EX_7 , SH_ACS_PPE1 ); REG64( EX_7_CME_LCL_EIMR_PPE2 , RULL(0x10C020030), SH_UNT_EX_7 , SH_ACS_PPE2 ); +REG64( EX_7_CME_LCL_EIMR_SCOM , RULL(0x13012426), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_LCL_EIMR_PPE , RULL(0x10D010020), SH_UNT_EX_8 , SH_ACS_PPE ); REG64( EX_8_CME_LCL_EIMR_PPE1 , RULL(0x10D010038), SH_UNT_EX_8 , SH_ACS_PPE1 ); REG64( EX_8_CME_LCL_EIMR_PPE2 , RULL(0x10D010030), SH_UNT_EX_8 , SH_ACS_PPE2 ); -REG64( EX_8_CME_LCL_EIMR_SCOM , RULL(0x14012426), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_LCL_EIMR_SCOM , RULL(0x14012026), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_LCL_EIMR_PPE , RULL(0x10D020020), SH_UNT_EX_9 , SH_ACS_PPE ); REG64( EX_9_CME_LCL_EIMR_PPE1 , RULL(0x10D020038), SH_UNT_EX_9 , SH_ACS_PPE1 ); REG64( EX_9_CME_LCL_EIMR_PPE2 , RULL(0x10D020030), SH_UNT_EX_9 , SH_ACS_PPE2 ); +REG64( EX_9_CME_LCL_EIMR_SCOM , RULL(0x14012426), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_LCL_EIMR_PPE , RULL(0x10E010020), SH_UNT_EX_10 , SH_ACS_PPE ); REG64( EX_10_CME_LCL_EIMR_PPE1 , RULL(0x10E010038), SH_UNT_EX_10 , SH_ACS_PPE1 ); REG64( EX_10_CME_LCL_EIMR_PPE2 , RULL(0x10E010030), SH_UNT_EX_10 , SH_ACS_PPE2 ); -REG64( EX_10_CME_LCL_EIMR_SCOM , RULL(0x15012426), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_LCL_EIMR_SCOM , RULL(0x15012026), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_LCL_EIMR_PPE , RULL(0x10E020020), SH_UNT_EX_11 , SH_ACS_PPE ); REG64( EX_11_CME_LCL_EIMR_PPE1 , RULL(0x10E020038), SH_UNT_EX_11 , SH_ACS_PPE1 ); REG64( EX_11_CME_LCL_EIMR_PPE2 , RULL(0x10E020030), SH_UNT_EX_11 , SH_ACS_PPE2 ); +REG64( EX_11_CME_LCL_EIMR_SCOM , RULL(0x15012426), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_LCL_EINR , RULL(0x1001242A), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 1001202A, @@ -1142,37 +1148,43 @@ REG64( EQ_5_CME_LCL_EINR , RULL(0x1501242A SH_ACS_SCOM_RO ); //DUPS: 1501202A, REG64( EX_CME_LCL_EINR_PPE , RULL(0x1090100A0), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_LCL_EINR_SCOM , RULL(0x1001242A), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_LCL_EINR_SCOM , RULL(0x1001202A), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_LCL_EINR_PPE , RULL(0x1090100A0), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_LCL_EINR_SCOM , RULL(0x1001242A), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_LCL_EINR_SCOM , RULL(0x1001202A), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_LCL_EINR_PPE , RULL(0x1090200A0), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_LCL_EINR_SCOM , RULL(0x1001242A), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_LCL_EINR_PPE , RULL(0x10A0100A0), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_LCL_EINR_SCOM , RULL(0x1101242A), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_LCL_EINR_SCOM , RULL(0x1101202A), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_LCL_EINR_PPE , RULL(0x10A0200A0), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_LCL_EINR_SCOM , RULL(0x1101242A), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_LCL_EINR_PPE , RULL(0x10B0100A0), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_LCL_EINR_SCOM , RULL(0x1201242A), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_LCL_EINR_SCOM , RULL(0x1201202A), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_LCL_EINR_PPE , RULL(0x10B0200A0), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_LCL_EINR_SCOM , RULL(0x1201242A), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_LCL_EINR_PPE , RULL(0x10C0100A0), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_LCL_EINR_SCOM , RULL(0x1301242A), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_LCL_EINR_SCOM , RULL(0x1301202A), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_LCL_EINR_PPE , RULL(0x10C0200A0), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_LCL_EINR_SCOM , RULL(0x1301242A), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_LCL_EINR_PPE , RULL(0x10D0100A0), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_LCL_EINR_SCOM , RULL(0x1401242A), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_LCL_EINR_SCOM , RULL(0x1401202A), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_LCL_EINR_PPE , RULL(0x10D0200A0), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_LCL_EINR_SCOM , RULL(0x1401242A), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_LCL_EINR_PPE , RULL(0x10E0100A0), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_LCL_EINR_SCOM , RULL(0x1501242A), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_LCL_EINR_SCOM , RULL(0x1501202A), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_LCL_EINR_PPE , RULL(0x10E0200A0), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_LCL_EINR_SCOM , RULL(0x1501242A), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_LCL_EIPR , RULL(0x10012427), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 10012027, @@ -1194,85 +1206,91 @@ REG64( EX_CME_LCL_EIPR_PPE1 , RULL(0x10901005 SH_ACS_PPE1 ); REG64( EX_CME_LCL_EIPR_PPE2 , RULL(0x109010050), SH_UNT_EX , SH_ACS_PPE2 ); -REG64( EX_CME_LCL_EIPR_SCOM , RULL(0x10012427), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_LCL_EIPR_SCOM , RULL(0x10012027), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_LCL_EIPR_PPE , RULL(0x109010040), SH_UNT_EX_0 , SH_ACS_PPE ); REG64( EX_0_CME_LCL_EIPR_PPE1 , RULL(0x109010058), SH_UNT_EX_0 , SH_ACS_PPE1 ); REG64( EX_0_CME_LCL_EIPR_PPE2 , RULL(0x109010050), SH_UNT_EX_0 , SH_ACS_PPE2 ); -REG64( EX_0_CME_LCL_EIPR_SCOM , RULL(0x10012427), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_LCL_EIPR_SCOM , RULL(0x10012027), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_LCL_EIPR_PPE , RULL(0x109020040), SH_UNT_EX_1 , SH_ACS_PPE ); REG64( EX_1_CME_LCL_EIPR_PPE1 , RULL(0x109020058), SH_UNT_EX_1 , SH_ACS_PPE1 ); REG64( EX_1_CME_LCL_EIPR_PPE2 , RULL(0x109020050), SH_UNT_EX_1 , SH_ACS_PPE2 ); +REG64( EX_1_CME_LCL_EIPR_SCOM , RULL(0x10012427), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_LCL_EIPR_PPE , RULL(0x10A010040), SH_UNT_EX_2 , SH_ACS_PPE ); REG64( EX_2_CME_LCL_EIPR_PPE1 , RULL(0x10A010058), SH_UNT_EX_2 , SH_ACS_PPE1 ); REG64( EX_2_CME_LCL_EIPR_PPE2 , RULL(0x10A010050), SH_UNT_EX_2 , SH_ACS_PPE2 ); -REG64( EX_2_CME_LCL_EIPR_SCOM , RULL(0x11012427), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_LCL_EIPR_SCOM , RULL(0x11012027), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_LCL_EIPR_PPE , RULL(0x10A020040), SH_UNT_EX_3 , SH_ACS_PPE ); REG64( EX_3_CME_LCL_EIPR_PPE1 , RULL(0x10A020058), SH_UNT_EX_3 , SH_ACS_PPE1 ); REG64( EX_3_CME_LCL_EIPR_PPE2 , RULL(0x10A020050), SH_UNT_EX_3 , SH_ACS_PPE2 ); +REG64( EX_3_CME_LCL_EIPR_SCOM , RULL(0x11012427), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_LCL_EIPR_PPE , RULL(0x10B010040), SH_UNT_EX_4 , SH_ACS_PPE ); REG64( EX_4_CME_LCL_EIPR_PPE1 , RULL(0x10B010058), SH_UNT_EX_4 , SH_ACS_PPE1 ); REG64( EX_4_CME_LCL_EIPR_PPE2 , RULL(0x10B010050), SH_UNT_EX_4 , SH_ACS_PPE2 ); -REG64( EX_4_CME_LCL_EIPR_SCOM , RULL(0x12012427), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_LCL_EIPR_SCOM , RULL(0x12012027), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_LCL_EIPR_PPE , RULL(0x10B020040), SH_UNT_EX_5 , SH_ACS_PPE ); REG64( EX_5_CME_LCL_EIPR_PPE1 , RULL(0x10B020058), SH_UNT_EX_5 , SH_ACS_PPE1 ); REG64( EX_5_CME_LCL_EIPR_PPE2 , RULL(0x10B020050), SH_UNT_EX_5 , SH_ACS_PPE2 ); +REG64( EX_5_CME_LCL_EIPR_SCOM , RULL(0x12012427), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_LCL_EIPR_PPE , RULL(0x10C010040), SH_UNT_EX_6 , SH_ACS_PPE ); REG64( EX_6_CME_LCL_EIPR_PPE1 , RULL(0x10C010058), SH_UNT_EX_6 , SH_ACS_PPE1 ); REG64( EX_6_CME_LCL_EIPR_PPE2 , RULL(0x10C010050), SH_UNT_EX_6 , SH_ACS_PPE2 ); -REG64( EX_6_CME_LCL_EIPR_SCOM , RULL(0x13012427), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_LCL_EIPR_SCOM , RULL(0x13012027), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_LCL_EIPR_PPE , RULL(0x10C020040), SH_UNT_EX_7 , SH_ACS_PPE ); REG64( EX_7_CME_LCL_EIPR_PPE1 , RULL(0x10C020058), SH_UNT_EX_7 , SH_ACS_PPE1 ); REG64( EX_7_CME_LCL_EIPR_PPE2 , RULL(0x10C020050), SH_UNT_EX_7 , SH_ACS_PPE2 ); +REG64( EX_7_CME_LCL_EIPR_SCOM , RULL(0x13012427), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_LCL_EIPR_PPE , RULL(0x10D010040), SH_UNT_EX_8 , SH_ACS_PPE ); REG64( EX_8_CME_LCL_EIPR_PPE1 , RULL(0x10D010058), SH_UNT_EX_8 , SH_ACS_PPE1 ); REG64( EX_8_CME_LCL_EIPR_PPE2 , RULL(0x10D010050), SH_UNT_EX_8 , SH_ACS_PPE2 ); -REG64( EX_8_CME_LCL_EIPR_SCOM , RULL(0x14012427), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_LCL_EIPR_SCOM , RULL(0x14012027), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_LCL_EIPR_PPE , RULL(0x10D020040), SH_UNT_EX_9 , SH_ACS_PPE ); REG64( EX_9_CME_LCL_EIPR_PPE1 , RULL(0x10D020058), SH_UNT_EX_9 , SH_ACS_PPE1 ); REG64( EX_9_CME_LCL_EIPR_PPE2 , RULL(0x10D020050), SH_UNT_EX_9 , SH_ACS_PPE2 ); +REG64( EX_9_CME_LCL_EIPR_SCOM , RULL(0x14012427), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_LCL_EIPR_PPE , RULL(0x10E010040), SH_UNT_EX_10 , SH_ACS_PPE ); REG64( EX_10_CME_LCL_EIPR_PPE1 , RULL(0x10E010058), SH_UNT_EX_10 , SH_ACS_PPE1 ); REG64( EX_10_CME_LCL_EIPR_PPE2 , RULL(0x10E010050), SH_UNT_EX_10 , SH_ACS_PPE2 ); -REG64( EX_10_CME_LCL_EIPR_SCOM , RULL(0x15012427), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_LCL_EIPR_SCOM , RULL(0x15012027), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_LCL_EIPR_PPE , RULL(0x10E020040), SH_UNT_EX_11 , SH_ACS_PPE ); REG64( EX_11_CME_LCL_EIPR_PPE1 , RULL(0x10E020058), SH_UNT_EX_11 , SH_ACS_PPE1 ); REG64( EX_11_CME_LCL_EIPR_PPE2 , RULL(0x10E020050), SH_UNT_EX_11 , SH_ACS_PPE2 ); +REG64( EX_11_CME_LCL_EIPR_SCOM , RULL(0x15012427), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_LCL_EISR , RULL(0x10012425), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 10012025, @@ -1294,85 +1312,91 @@ REG64( EX_CME_LCL_EISR_PPE1 , RULL(0x10901001 SH_ACS_PPE1 ); REG64( EX_CME_LCL_EISR_PPE2 , RULL(0x109010010), SH_UNT_EX , SH_ACS_PPE2 ); -REG64( EX_CME_LCL_EISR_SCOM , RULL(0x10012425), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_LCL_EISR_SCOM , RULL(0x10012025), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_LCL_EISR_PPE , RULL(0x109010000), SH_UNT_EX_0 , SH_ACS_PPE ); REG64( EX_0_CME_LCL_EISR_PPE1 , RULL(0x109010018), SH_UNT_EX_0 , SH_ACS_PPE1 ); REG64( EX_0_CME_LCL_EISR_PPE2 , RULL(0x109010010), SH_UNT_EX_0 , SH_ACS_PPE2 ); -REG64( EX_0_CME_LCL_EISR_SCOM , RULL(0x10012425), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_LCL_EISR_SCOM , RULL(0x10012025), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_LCL_EISR_PPE , RULL(0x109020000), SH_UNT_EX_1 , SH_ACS_PPE ); REG64( EX_1_CME_LCL_EISR_PPE1 , RULL(0x109020018), SH_UNT_EX_1 , SH_ACS_PPE1 ); REG64( EX_1_CME_LCL_EISR_PPE2 , RULL(0x109020010), SH_UNT_EX_1 , SH_ACS_PPE2 ); +REG64( EX_1_CME_LCL_EISR_SCOM , RULL(0x10012425), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_LCL_EISR_PPE , RULL(0x10A010000), SH_UNT_EX_2 , SH_ACS_PPE ); REG64( EX_2_CME_LCL_EISR_PPE1 , RULL(0x10A010018), SH_UNT_EX_2 , SH_ACS_PPE1 ); REG64( EX_2_CME_LCL_EISR_PPE2 , RULL(0x10A010010), SH_UNT_EX_2 , SH_ACS_PPE2 ); -REG64( EX_2_CME_LCL_EISR_SCOM , RULL(0x11012425), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_LCL_EISR_SCOM , RULL(0x11012025), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_LCL_EISR_PPE , RULL(0x10A020000), SH_UNT_EX_3 , SH_ACS_PPE ); REG64( EX_3_CME_LCL_EISR_PPE1 , RULL(0x10A020018), SH_UNT_EX_3 , SH_ACS_PPE1 ); REG64( EX_3_CME_LCL_EISR_PPE2 , RULL(0x10A020010), SH_UNT_EX_3 , SH_ACS_PPE2 ); +REG64( EX_3_CME_LCL_EISR_SCOM , RULL(0x11012425), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_LCL_EISR_PPE , RULL(0x10B010000), SH_UNT_EX_4 , SH_ACS_PPE ); REG64( EX_4_CME_LCL_EISR_PPE1 , RULL(0x10B010018), SH_UNT_EX_4 , SH_ACS_PPE1 ); REG64( EX_4_CME_LCL_EISR_PPE2 , RULL(0x10B010010), SH_UNT_EX_4 , SH_ACS_PPE2 ); -REG64( EX_4_CME_LCL_EISR_SCOM , RULL(0x12012425), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_LCL_EISR_SCOM , RULL(0x12012025), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_LCL_EISR_PPE , RULL(0x10B020000), SH_UNT_EX_5 , SH_ACS_PPE ); REG64( EX_5_CME_LCL_EISR_PPE1 , RULL(0x10B020018), SH_UNT_EX_5 , SH_ACS_PPE1 ); REG64( EX_5_CME_LCL_EISR_PPE2 , RULL(0x10B020010), SH_UNT_EX_5 , SH_ACS_PPE2 ); +REG64( EX_5_CME_LCL_EISR_SCOM , RULL(0x12012425), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_LCL_EISR_PPE , RULL(0x10C010000), SH_UNT_EX_6 , SH_ACS_PPE ); REG64( EX_6_CME_LCL_EISR_PPE1 , RULL(0x10C010018), SH_UNT_EX_6 , SH_ACS_PPE1 ); REG64( EX_6_CME_LCL_EISR_PPE2 , RULL(0x10C010010), SH_UNT_EX_6 , SH_ACS_PPE2 ); -REG64( EX_6_CME_LCL_EISR_SCOM , RULL(0x13012425), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_LCL_EISR_SCOM , RULL(0x13012025), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_LCL_EISR_PPE , RULL(0x10C020000), SH_UNT_EX_7 , SH_ACS_PPE ); REG64( EX_7_CME_LCL_EISR_PPE1 , RULL(0x10C020018), SH_UNT_EX_7 , SH_ACS_PPE1 ); REG64( EX_7_CME_LCL_EISR_PPE2 , RULL(0x10C020010), SH_UNT_EX_7 , SH_ACS_PPE2 ); +REG64( EX_7_CME_LCL_EISR_SCOM , RULL(0x13012425), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_LCL_EISR_PPE , RULL(0x10D010000), SH_UNT_EX_8 , SH_ACS_PPE ); REG64( EX_8_CME_LCL_EISR_PPE1 , RULL(0x10D010018), SH_UNT_EX_8 , SH_ACS_PPE1 ); REG64( EX_8_CME_LCL_EISR_PPE2 , RULL(0x10D010010), SH_UNT_EX_8 , SH_ACS_PPE2 ); -REG64( EX_8_CME_LCL_EISR_SCOM , RULL(0x14012425), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_LCL_EISR_SCOM , RULL(0x14012025), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_LCL_EISR_PPE , RULL(0x10D020000), SH_UNT_EX_9 , SH_ACS_PPE ); REG64( EX_9_CME_LCL_EISR_PPE1 , RULL(0x10D020018), SH_UNT_EX_9 , SH_ACS_PPE1 ); REG64( EX_9_CME_LCL_EISR_PPE2 , RULL(0x10D020010), SH_UNT_EX_9 , SH_ACS_PPE2 ); +REG64( EX_9_CME_LCL_EISR_SCOM , RULL(0x14012425), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_LCL_EISR_PPE , RULL(0x10E010000), SH_UNT_EX_10 , SH_ACS_PPE ); REG64( EX_10_CME_LCL_EISR_PPE1 , RULL(0x10E010018), SH_UNT_EX_10 , SH_ACS_PPE1 ); REG64( EX_10_CME_LCL_EISR_PPE2 , RULL(0x10E010010), SH_UNT_EX_10 , SH_ACS_PPE2 ); -REG64( EX_10_CME_LCL_EISR_SCOM , RULL(0x15012425), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_LCL_EISR_SCOM , RULL(0x15012025), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_LCL_EISR_PPE , RULL(0x10E020000), SH_UNT_EX_11 , SH_ACS_PPE ); REG64( EX_11_CME_LCL_EISR_PPE1 , RULL(0x10E020018), SH_UNT_EX_11 , SH_ACS_PPE1 ); REG64( EX_11_CME_LCL_EISR_PPE2 , RULL(0x10E020010), SH_UNT_EX_11 , SH_ACS_PPE2 ); +REG64( EX_11_CME_LCL_EISR_SCOM , RULL(0x15012425), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_LCL_EISTR , RULL(0x10012429), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 10012029, @@ -1390,37 +1414,43 @@ REG64( EQ_5_CME_LCL_EISTR , RULL(0x15012429 SH_ACS_SCOM_RO ); //DUPS: 15012029, REG64( EX_CME_LCL_EISTR_PPE , RULL(0x109010080), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_LCL_EISTR_SCOM , RULL(0x10012429), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_LCL_EISTR_SCOM , RULL(0x10012029), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_LCL_EISTR_PPE , RULL(0x109010080), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_LCL_EISTR_SCOM , RULL(0x10012429), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_LCL_EISTR_SCOM , RULL(0x10012029), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_LCL_EISTR_PPE , RULL(0x109020080), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_LCL_EISTR_SCOM , RULL(0x10012429), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_LCL_EISTR_PPE , RULL(0x10A010080), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_LCL_EISTR_SCOM , RULL(0x11012429), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_LCL_EISTR_SCOM , RULL(0x11012029), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_LCL_EISTR_PPE , RULL(0x10A020080), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_LCL_EISTR_SCOM , RULL(0x11012429), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_LCL_EISTR_PPE , RULL(0x10B010080), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_LCL_EISTR_SCOM , RULL(0x12012429), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_LCL_EISTR_SCOM , RULL(0x12012029), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_LCL_EISTR_PPE , RULL(0x10B020080), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_LCL_EISTR_SCOM , RULL(0x12012429), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_LCL_EISTR_PPE , RULL(0x10C010080), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_LCL_EISTR_SCOM , RULL(0x13012429), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_LCL_EISTR_SCOM , RULL(0x13012029), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_LCL_EISTR_PPE , RULL(0x10C020080), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_LCL_EISTR_SCOM , RULL(0x13012429), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_LCL_EISTR_PPE , RULL(0x10D010080), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_LCL_EISTR_SCOM , RULL(0x14012429), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_LCL_EISTR_SCOM , RULL(0x14012029), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_LCL_EISTR_PPE , RULL(0x10D020080), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_LCL_EISTR_SCOM , RULL(0x14012429), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_LCL_EISTR_PPE , RULL(0x10E010080), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_LCL_EISTR_SCOM , RULL(0x15012429), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_LCL_EISTR_SCOM , RULL(0x15012029), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_LCL_EISTR_PPE , RULL(0x10E020080), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_LCL_EISTR_SCOM , RULL(0x15012429), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_LCL_EITR , RULL(0x10012428), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 10012028, @@ -1442,85 +1472,91 @@ REG64( EX_CME_LCL_EITR_PPE1 , RULL(0x10901007 SH_ACS_PPE1 ); REG64( EX_CME_LCL_EITR_PPE2 , RULL(0x109010070), SH_UNT_EX , SH_ACS_PPE2 ); -REG64( EX_CME_LCL_EITR_SCOM , RULL(0x10012428), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_LCL_EITR_SCOM , RULL(0x10012028), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_LCL_EITR_PPE , RULL(0x109010060), SH_UNT_EX_0 , SH_ACS_PPE ); REG64( EX_0_CME_LCL_EITR_PPE1 , RULL(0x109010078), SH_UNT_EX_0 , SH_ACS_PPE1 ); REG64( EX_0_CME_LCL_EITR_PPE2 , RULL(0x109010070), SH_UNT_EX_0 , SH_ACS_PPE2 ); -REG64( EX_0_CME_LCL_EITR_SCOM , RULL(0x10012428), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_LCL_EITR_SCOM , RULL(0x10012028), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_LCL_EITR_PPE , RULL(0x109020060), SH_UNT_EX_1 , SH_ACS_PPE ); REG64( EX_1_CME_LCL_EITR_PPE1 , RULL(0x109020078), SH_UNT_EX_1 , SH_ACS_PPE1 ); REG64( EX_1_CME_LCL_EITR_PPE2 , RULL(0x109020070), SH_UNT_EX_1 , SH_ACS_PPE2 ); +REG64( EX_1_CME_LCL_EITR_SCOM , RULL(0x10012428), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_LCL_EITR_PPE , RULL(0x10A010060), SH_UNT_EX_2 , SH_ACS_PPE ); REG64( EX_2_CME_LCL_EITR_PPE1 , RULL(0x10A010078), SH_UNT_EX_2 , SH_ACS_PPE1 ); REG64( EX_2_CME_LCL_EITR_PPE2 , RULL(0x10A010070), SH_UNT_EX_2 , SH_ACS_PPE2 ); -REG64( EX_2_CME_LCL_EITR_SCOM , RULL(0x11012428), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_LCL_EITR_SCOM , RULL(0x11012028), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_LCL_EITR_PPE , RULL(0x10A020060), SH_UNT_EX_3 , SH_ACS_PPE ); REG64( EX_3_CME_LCL_EITR_PPE1 , RULL(0x10A020078), SH_UNT_EX_3 , SH_ACS_PPE1 ); REG64( EX_3_CME_LCL_EITR_PPE2 , RULL(0x10A020070), SH_UNT_EX_3 , SH_ACS_PPE2 ); +REG64( EX_3_CME_LCL_EITR_SCOM , RULL(0x11012428), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_LCL_EITR_PPE , RULL(0x10B010060), SH_UNT_EX_4 , SH_ACS_PPE ); REG64( EX_4_CME_LCL_EITR_PPE1 , RULL(0x10B010078), SH_UNT_EX_4 , SH_ACS_PPE1 ); REG64( EX_4_CME_LCL_EITR_PPE2 , RULL(0x10B010070), SH_UNT_EX_4 , SH_ACS_PPE2 ); -REG64( EX_4_CME_LCL_EITR_SCOM , RULL(0x12012428), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_LCL_EITR_SCOM , RULL(0x12012028), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_LCL_EITR_PPE , RULL(0x10B020060), SH_UNT_EX_5 , SH_ACS_PPE ); REG64( EX_5_CME_LCL_EITR_PPE1 , RULL(0x10B020078), SH_UNT_EX_5 , SH_ACS_PPE1 ); REG64( EX_5_CME_LCL_EITR_PPE2 , RULL(0x10B020070), SH_UNT_EX_5 , SH_ACS_PPE2 ); +REG64( EX_5_CME_LCL_EITR_SCOM , RULL(0x12012428), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_LCL_EITR_PPE , RULL(0x10C010060), SH_UNT_EX_6 , SH_ACS_PPE ); REG64( EX_6_CME_LCL_EITR_PPE1 , RULL(0x10C010078), SH_UNT_EX_6 , SH_ACS_PPE1 ); REG64( EX_6_CME_LCL_EITR_PPE2 , RULL(0x10C010070), SH_UNT_EX_6 , SH_ACS_PPE2 ); -REG64( EX_6_CME_LCL_EITR_SCOM , RULL(0x13012428), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_LCL_EITR_SCOM , RULL(0x13012028), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_LCL_EITR_PPE , RULL(0x10C020060), SH_UNT_EX_7 , SH_ACS_PPE ); REG64( EX_7_CME_LCL_EITR_PPE1 , RULL(0x10C020078), SH_UNT_EX_7 , SH_ACS_PPE1 ); REG64( EX_7_CME_LCL_EITR_PPE2 , RULL(0x10C020070), SH_UNT_EX_7 , SH_ACS_PPE2 ); +REG64( EX_7_CME_LCL_EITR_SCOM , RULL(0x13012428), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_LCL_EITR_PPE , RULL(0x10D010060), SH_UNT_EX_8 , SH_ACS_PPE ); REG64( EX_8_CME_LCL_EITR_PPE1 , RULL(0x10D010078), SH_UNT_EX_8 , SH_ACS_PPE1 ); REG64( EX_8_CME_LCL_EITR_PPE2 , RULL(0x10D010070), SH_UNT_EX_8 , SH_ACS_PPE2 ); -REG64( EX_8_CME_LCL_EITR_SCOM , RULL(0x14012428), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_LCL_EITR_SCOM , RULL(0x14012028), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_LCL_EITR_PPE , RULL(0x10D020060), SH_UNT_EX_9 , SH_ACS_PPE ); REG64( EX_9_CME_LCL_EITR_PPE1 , RULL(0x10D020078), SH_UNT_EX_9 , SH_ACS_PPE1 ); REG64( EX_9_CME_LCL_EITR_PPE2 , RULL(0x10D020070), SH_UNT_EX_9 , SH_ACS_PPE2 ); +REG64( EX_9_CME_LCL_EITR_SCOM , RULL(0x14012428), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_LCL_EITR_PPE , RULL(0x10E010060), SH_UNT_EX_10 , SH_ACS_PPE ); REG64( EX_10_CME_LCL_EITR_PPE1 , RULL(0x10E010078), SH_UNT_EX_10 , SH_ACS_PPE1 ); REG64( EX_10_CME_LCL_EITR_PPE2 , RULL(0x10E010070), SH_UNT_EX_10 , SH_ACS_PPE2 ); -REG64( EX_10_CME_LCL_EITR_SCOM , RULL(0x15012428), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_LCL_EITR_SCOM , RULL(0x15012028), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_LCL_EITR_PPE , RULL(0x10E020060), SH_UNT_EX_11 , SH_ACS_PPE ); REG64( EX_11_CME_LCL_EITR_PPE1 , RULL(0x10E020078), SH_UNT_EX_11 , SH_ACS_PPE1 ); REG64( EX_11_CME_LCL_EITR_PPE2 , RULL(0x10E020070), SH_UNT_EX_11 , SH_ACS_PPE2 ); +REG64( EX_11_CME_LCL_EITR_SCOM , RULL(0x15012428), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EX_CME_LCL_ICCR_PPE , RULL(0x109010700), SH_UNT_EX , SH_ACS_PPE ); @@ -1617,37 +1653,43 @@ REG64( EQ_5_CME_LCL_ICRR , RULL(0x1501244D SH_ACS_SCOM_RO ); //DUPS: 1501204D, REG64( EX_CME_LCL_ICRR_PPE , RULL(0x109010740), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_LCL_ICRR_SCOM , RULL(0x1001244D), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_LCL_ICRR_SCOM , RULL(0x1001204D), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_LCL_ICRR_PPE , RULL(0x109010740), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_LCL_ICRR_SCOM , RULL(0x1001244D), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_LCL_ICRR_SCOM , RULL(0x1001204D), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_LCL_ICRR_PPE , RULL(0x109020740), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_LCL_ICRR_SCOM , RULL(0x1001244D), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_LCL_ICRR_PPE , RULL(0x10A010740), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_LCL_ICRR_SCOM , RULL(0x1101244D), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_LCL_ICRR_SCOM , RULL(0x1101204D), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_LCL_ICRR_PPE , RULL(0x10A020740), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_LCL_ICRR_SCOM , RULL(0x1101244D), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_LCL_ICRR_PPE , RULL(0x10B010740), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_LCL_ICRR_SCOM , RULL(0x1201244D), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_LCL_ICRR_SCOM , RULL(0x1201204D), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_LCL_ICRR_PPE , RULL(0x10B020740), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_LCL_ICRR_SCOM , RULL(0x1201244D), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_LCL_ICRR_PPE , RULL(0x10C010740), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_LCL_ICRR_SCOM , RULL(0x1301244D), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_LCL_ICRR_SCOM , RULL(0x1301204D), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_LCL_ICRR_PPE , RULL(0x10C020740), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_LCL_ICRR_SCOM , RULL(0x1301244D), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_LCL_ICRR_PPE , RULL(0x10D010740), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_LCL_ICRR_SCOM , RULL(0x1401244D), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_LCL_ICRR_SCOM , RULL(0x1401204D), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_LCL_ICRR_PPE , RULL(0x10D020740), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_LCL_ICRR_SCOM , RULL(0x1401244D), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_LCL_ICRR_PPE , RULL(0x10E010740), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_LCL_ICRR_SCOM , RULL(0x1501244D), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_LCL_ICRR_SCOM , RULL(0x1501204D), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_LCL_ICRR_PPE , RULL(0x10E020740), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_LCL_ICRR_SCOM , RULL(0x1501244D), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EX_CME_LCL_ICSR_PPE , RULL(0x109010720), SH_UNT_EX , SH_ACS_PPE ); @@ -1773,37 +1815,43 @@ REG64( EQ_5_CME_LCL_SISR , RULL(0x1501244C SH_ACS_SCOM_RO ); //DUPS: 1501204C, REG64( EX_CME_LCL_SISR_PPE , RULL(0x109010520), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_LCL_SISR_SCOM , RULL(0x1001244C), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_LCL_SISR_SCOM , RULL(0x1001204C), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_LCL_SISR_PPE , RULL(0x109010520), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_LCL_SISR_SCOM , RULL(0x1001244C), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_LCL_SISR_SCOM , RULL(0x1001204C), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_LCL_SISR_PPE , RULL(0x109020520), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_LCL_SISR_SCOM , RULL(0x1001244C), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_LCL_SISR_PPE , RULL(0x10A010520), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_LCL_SISR_SCOM , RULL(0x1101244C), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_LCL_SISR_SCOM , RULL(0x1101204C), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_LCL_SISR_PPE , RULL(0x10A020520), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_LCL_SISR_SCOM , RULL(0x1101244C), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_LCL_SISR_PPE , RULL(0x10B010520), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_LCL_SISR_SCOM , RULL(0x1201244C), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_LCL_SISR_SCOM , RULL(0x1201204C), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_LCL_SISR_PPE , RULL(0x10B020520), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_LCL_SISR_SCOM , RULL(0x1201244C), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_LCL_SISR_PPE , RULL(0x10C010520), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_LCL_SISR_SCOM , RULL(0x1301244C), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_LCL_SISR_SCOM , RULL(0x1301204C), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_LCL_SISR_PPE , RULL(0x10C020520), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_LCL_SISR_SCOM , RULL(0x1301244C), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_LCL_SISR_PPE , RULL(0x10D010520), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_LCL_SISR_SCOM , RULL(0x1401244C), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_LCL_SISR_SCOM , RULL(0x1401204C), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_LCL_SISR_PPE , RULL(0x10D020520), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_LCL_SISR_SCOM , RULL(0x1401244C), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_LCL_SISR_PPE , RULL(0x10E010520), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_LCL_SISR_SCOM , RULL(0x1501244C), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_LCL_SISR_SCOM , RULL(0x1501204C), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_LCL_SISR_PPE , RULL(0x10E020520), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_LCL_SISR_SCOM , RULL(0x1501244C), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EX_CME_LCL_TSEL_PPE , RULL(0x109010100), SH_UNT_EX , SH_ACS_PPE ); @@ -1848,37 +1896,43 @@ REG64( EQ_5_CME_SCOM_AFSR , RULL(0x15012433 SH_ACS_SCOM ); //DUPS: 15012033, REG64( EX_CME_SCOM_AFSR_PPE , RULL(0x109010160), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_AFSR_SCOM , RULL(0x10012433), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_CME_SCOM_AFSR_SCOM , RULL(0x10012033), SH_UNT_EX , SH_ACS_SCOM ); REG64( EX_0_CME_SCOM_AFSR_PPE , RULL(0x109010160), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_AFSR_SCOM , RULL(0x10012433), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_0_CME_SCOM_AFSR_SCOM , RULL(0x10012033), SH_UNT_EX_0 , SH_ACS_SCOM ); REG64( EX_1_CME_SCOM_AFSR_PPE , RULL(0x109020160), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_AFSR_SCOM , RULL(0x10012433), SH_UNT_EX_1 , SH_ACS_SCOM ); REG64( EX_2_CME_SCOM_AFSR_PPE , RULL(0x10A010160), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_AFSR_SCOM , RULL(0x11012433), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_2_CME_SCOM_AFSR_SCOM , RULL(0x11012033), SH_UNT_EX_2 , SH_ACS_SCOM ); REG64( EX_3_CME_SCOM_AFSR_PPE , RULL(0x10A020160), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_AFSR_SCOM , RULL(0x11012433), SH_UNT_EX_3 , SH_ACS_SCOM ); REG64( EX_4_CME_SCOM_AFSR_PPE , RULL(0x10B010160), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_AFSR_SCOM , RULL(0x12012433), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_4_CME_SCOM_AFSR_SCOM , RULL(0x12012033), SH_UNT_EX_4 , SH_ACS_SCOM ); REG64( EX_5_CME_SCOM_AFSR_PPE , RULL(0x10B020160), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_AFSR_SCOM , RULL(0x12012433), SH_UNT_EX_5 , SH_ACS_SCOM ); REG64( EX_6_CME_SCOM_AFSR_PPE , RULL(0x10C010160), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_AFSR_SCOM , RULL(0x13012433), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_6_CME_SCOM_AFSR_SCOM , RULL(0x13012033), SH_UNT_EX_6 , SH_ACS_SCOM ); REG64( EX_7_CME_SCOM_AFSR_PPE , RULL(0x10C020160), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_AFSR_SCOM , RULL(0x13012433), SH_UNT_EX_7 , SH_ACS_SCOM ); REG64( EX_8_CME_SCOM_AFSR_PPE , RULL(0x10D010160), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_AFSR_SCOM , RULL(0x14012433), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_8_CME_SCOM_AFSR_SCOM , RULL(0x14012033), SH_UNT_EX_8 , SH_ACS_SCOM ); REG64( EX_9_CME_SCOM_AFSR_PPE , RULL(0x10D020160), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_AFSR_SCOM , RULL(0x14012433), SH_UNT_EX_9 , SH_ACS_SCOM ); REG64( EX_10_CME_SCOM_AFSR_PPE , RULL(0x10E010160), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_AFSR_SCOM , RULL(0x15012433), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_10_CME_SCOM_AFSR_SCOM , RULL(0x15012033), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EX_11_CME_SCOM_AFSR_PPE , RULL(0x10E020160), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_AFSR_SCOM , RULL(0x15012433), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_CME_SCOM_AFTR , RULL(0x10012434), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 10012034, @@ -1896,37 +1950,43 @@ REG64( EQ_5_CME_SCOM_AFTR , RULL(0x15012434 SH_ACS_SCOM_RO ); //DUPS: 15012034, REG64( EX_CME_SCOM_AFTR_PPE , RULL(0x109010180), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_AFTR_SCOM , RULL(0x10012434), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_SCOM_AFTR_SCOM , RULL(0x10012034), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_SCOM_AFTR_PPE , RULL(0x109010180), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_AFTR_SCOM , RULL(0x10012434), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_SCOM_AFTR_SCOM , RULL(0x10012034), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_SCOM_AFTR_PPE , RULL(0x109020180), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_AFTR_SCOM , RULL(0x10012434), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_SCOM_AFTR_PPE , RULL(0x10A010180), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_AFTR_SCOM , RULL(0x11012434), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_SCOM_AFTR_SCOM , RULL(0x11012034), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_SCOM_AFTR_PPE , RULL(0x10A020180), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_AFTR_SCOM , RULL(0x11012434), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_SCOM_AFTR_PPE , RULL(0x10B010180), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_AFTR_SCOM , RULL(0x12012434), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_SCOM_AFTR_SCOM , RULL(0x12012034), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_SCOM_AFTR_PPE , RULL(0x10B020180), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_AFTR_SCOM , RULL(0x12012434), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_SCOM_AFTR_PPE , RULL(0x10C010180), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_AFTR_SCOM , RULL(0x13012434), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_SCOM_AFTR_SCOM , RULL(0x13012034), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_SCOM_AFTR_PPE , RULL(0x10C020180), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_AFTR_SCOM , RULL(0x13012434), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_SCOM_AFTR_PPE , RULL(0x10D010180), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_AFTR_SCOM , RULL(0x14012434), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_SCOM_AFTR_SCOM , RULL(0x14012034), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_SCOM_AFTR_PPE , RULL(0x10D020180), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_AFTR_SCOM , RULL(0x14012434), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_SCOM_AFTR_PPE , RULL(0x10E010180), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_AFTR_SCOM , RULL(0x15012434), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_SCOM_AFTR_SCOM , RULL(0x15012034), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_SCOM_AFTR_PPE , RULL(0x10E020180), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_AFTR_SCOM , RULL(0x15012434), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_SCOM_BCEBAR0 , RULL(0x10012430), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012030, @@ -1942,13 +2002,19 @@ REG64( EQ_4_CME_SCOM_BCEBAR0 , RULL(0x14012430 SH_ACS_SCOM_RW ); //DUPS: 14012030, REG64( EQ_5_CME_SCOM_BCEBAR0 , RULL(0x15012430), SH_UNT_EQ_5 , SH_ACS_SCOM_RW ); //DUPS: 15012030, -REG64( EX_CME_SCOM_BCEBAR0 , RULL(0x10012430), SH_UNT_EX , SH_ACS_SCOM_RW ); -REG64( EX_0_CME_SCOM_BCEBAR0 , RULL(0x10012430), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); -REG64( EX_2_CME_SCOM_BCEBAR0 , RULL(0x11012430), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); -REG64( EX_4_CME_SCOM_BCEBAR0 , RULL(0x12012430), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); -REG64( EX_6_CME_SCOM_BCEBAR0 , RULL(0x13012430), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); -REG64( EX_8_CME_SCOM_BCEBAR0 , RULL(0x14012430), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); -REG64( EX_10_CME_SCOM_BCEBAR0 , RULL(0x15012430), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_BCEBAR0 , RULL(0x10012030), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_BCEBAR0 , RULL(0x10012030), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_1_CME_SCOM_BCEBAR0 , RULL(0x10012430), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_BCEBAR0 , RULL(0x11012030), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_3_CME_SCOM_BCEBAR0 , RULL(0x11012430), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_BCEBAR0 , RULL(0x12012030), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_5_CME_SCOM_BCEBAR0 , RULL(0x12012430), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_BCEBAR0 , RULL(0x13012030), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_7_CME_SCOM_BCEBAR0 , RULL(0x13012430), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_BCEBAR0 , RULL(0x14012030), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_9_CME_SCOM_BCEBAR0 , RULL(0x14012430), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_BCEBAR0 , RULL(0x15012030), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_11_CME_SCOM_BCEBAR0 , RULL(0x15012430), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_BCEBAR1 , RULL(0x10012431), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012031, @@ -1964,13 +2030,19 @@ REG64( EQ_4_CME_SCOM_BCEBAR1 , RULL(0x14012431 SH_ACS_SCOM_RW ); //DUPS: 14012031, REG64( EQ_5_CME_SCOM_BCEBAR1 , RULL(0x15012431), SH_UNT_EQ_5 , SH_ACS_SCOM_RW ); //DUPS: 15012031, -REG64( EX_CME_SCOM_BCEBAR1 , RULL(0x10012431), SH_UNT_EX , SH_ACS_SCOM_RW ); -REG64( EX_0_CME_SCOM_BCEBAR1 , RULL(0x10012431), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); -REG64( EX_2_CME_SCOM_BCEBAR1 , RULL(0x11012431), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); -REG64( EX_4_CME_SCOM_BCEBAR1 , RULL(0x12012431), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); -REG64( EX_6_CME_SCOM_BCEBAR1 , RULL(0x13012431), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); -REG64( EX_8_CME_SCOM_BCEBAR1 , RULL(0x14012431), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); -REG64( EX_10_CME_SCOM_BCEBAR1 , RULL(0x15012431), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_BCEBAR1 , RULL(0x10012031), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_BCEBAR1 , RULL(0x10012031), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_1_CME_SCOM_BCEBAR1 , RULL(0x10012431), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_BCEBAR1 , RULL(0x11012031), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_3_CME_SCOM_BCEBAR1 , RULL(0x11012431), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_BCEBAR1 , RULL(0x12012031), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_5_CME_SCOM_BCEBAR1 , RULL(0x12012431), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_BCEBAR1 , RULL(0x13012031), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_7_CME_SCOM_BCEBAR1 , RULL(0x13012431), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_BCEBAR1 , RULL(0x14012031), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_9_CME_SCOM_BCEBAR1 , RULL(0x14012431), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_BCEBAR1 , RULL(0x15012031), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_11_CME_SCOM_BCEBAR1 , RULL(0x15012431), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_BCECSR , RULL(0x1001240F), SH_UNT_EQ , SH_ACS_SCOM ); //DUPS: 1001200F, @@ -1988,37 +2060,43 @@ REG64( EQ_5_CME_SCOM_BCECSR , RULL(0x1501240F SH_ACS_SCOM ); //DUPS: 1501200F, REG64( EX_CME_SCOM_BCECSR_PPE , RULL(0x1090101E0), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_BCECSR_SCOM , RULL(0x1001240F), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_CME_SCOM_BCECSR_SCOM , RULL(0x1001200F), SH_UNT_EX , SH_ACS_SCOM ); REG64( EX_0_CME_SCOM_BCECSR_PPE , RULL(0x1090101E0), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_BCECSR_SCOM , RULL(0x1001240F), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_0_CME_SCOM_BCECSR_SCOM , RULL(0x1001200F), SH_UNT_EX_0 , SH_ACS_SCOM ); REG64( EX_1_CME_SCOM_BCECSR_PPE , RULL(0x1090201E0), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_BCECSR_SCOM , RULL(0x1001240F), SH_UNT_EX_1 , SH_ACS_SCOM ); REG64( EX_2_CME_SCOM_BCECSR_PPE , RULL(0x10A0101E0), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_BCECSR_SCOM , RULL(0x1101240F), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_2_CME_SCOM_BCECSR_SCOM , RULL(0x1101200F), SH_UNT_EX_2 , SH_ACS_SCOM ); REG64( EX_3_CME_SCOM_BCECSR_PPE , RULL(0x10A0201E0), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_BCECSR_SCOM , RULL(0x1101240F), SH_UNT_EX_3 , SH_ACS_SCOM ); REG64( EX_4_CME_SCOM_BCECSR_PPE , RULL(0x10B0101E0), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_BCECSR_SCOM , RULL(0x1201240F), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_4_CME_SCOM_BCECSR_SCOM , RULL(0x1201200F), SH_UNT_EX_4 , SH_ACS_SCOM ); REG64( EX_5_CME_SCOM_BCECSR_PPE , RULL(0x10B0201E0), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_BCECSR_SCOM , RULL(0x1201240F), SH_UNT_EX_5 , SH_ACS_SCOM ); REG64( EX_6_CME_SCOM_BCECSR_PPE , RULL(0x10C0101E0), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_BCECSR_SCOM , RULL(0x1301240F), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_6_CME_SCOM_BCECSR_SCOM , RULL(0x1301200F), SH_UNT_EX_6 , SH_ACS_SCOM ); REG64( EX_7_CME_SCOM_BCECSR_PPE , RULL(0x10C0201E0), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_BCECSR_SCOM , RULL(0x1301240F), SH_UNT_EX_7 , SH_ACS_SCOM ); REG64( EX_8_CME_SCOM_BCECSR_PPE , RULL(0x10D0101E0), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_BCECSR_SCOM , RULL(0x1401240F), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_8_CME_SCOM_BCECSR_SCOM , RULL(0x1401200F), SH_UNT_EX_8 , SH_ACS_SCOM ); REG64( EX_9_CME_SCOM_BCECSR_PPE , RULL(0x10D0201E0), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_BCECSR_SCOM , RULL(0x1401240F), SH_UNT_EX_9 , SH_ACS_SCOM ); REG64( EX_10_CME_SCOM_BCECSR_PPE , RULL(0x10E0101E0), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_BCECSR_SCOM , RULL(0x1501240F), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_10_CME_SCOM_BCECSR_SCOM , RULL(0x1501200F), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EX_11_CME_SCOM_BCECSR_PPE , RULL(0x10E0201E0), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_BCECSR_SCOM , RULL(0x1501240F), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_CME_SCOM_CIDSR , RULL(0x1001242E), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 1001202E, @@ -2036,37 +2114,43 @@ REG64( EQ_5_CME_SCOM_CIDSR , RULL(0x1501242E SH_ACS_SCOM_RO ); //DUPS: 1501202E, REG64( EX_CME_SCOM_CIDSR_PPE , RULL(0x1090106C0), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_CIDSR_SCOM , RULL(0x1001242E), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_SCOM_CIDSR_SCOM , RULL(0x1001202E), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_SCOM_CIDSR_PPE , RULL(0x1090106C0), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_CIDSR_SCOM , RULL(0x1001242E), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_SCOM_CIDSR_SCOM , RULL(0x1001202E), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_SCOM_CIDSR_PPE , RULL(0x1090206C0), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_CIDSR_SCOM , RULL(0x1001242E), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_SCOM_CIDSR_PPE , RULL(0x10A0106C0), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_CIDSR_SCOM , RULL(0x1101242E), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_SCOM_CIDSR_SCOM , RULL(0x1101202E), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_SCOM_CIDSR_PPE , RULL(0x10A0206C0), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_CIDSR_SCOM , RULL(0x1101242E), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_SCOM_CIDSR_PPE , RULL(0x10B0106C0), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_CIDSR_SCOM , RULL(0x1201242E), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_SCOM_CIDSR_SCOM , RULL(0x1201202E), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_SCOM_CIDSR_PPE , RULL(0x10B0206C0), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_CIDSR_SCOM , RULL(0x1201242E), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_SCOM_CIDSR_PPE , RULL(0x10C0106C0), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_CIDSR_SCOM , RULL(0x1301242E), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_SCOM_CIDSR_SCOM , RULL(0x1301202E), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_SCOM_CIDSR_PPE , RULL(0x10C0206C0), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_CIDSR_SCOM , RULL(0x1301242E), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_SCOM_CIDSR_PPE , RULL(0x10D0106C0), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_CIDSR_SCOM , RULL(0x1401242E), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_SCOM_CIDSR_SCOM , RULL(0x1401202E), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_SCOM_CIDSR_PPE , RULL(0x10D0206C0), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_CIDSR_SCOM , RULL(0x1401242E), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_SCOM_CIDSR_PPE , RULL(0x10E0106C0), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_CIDSR_SCOM , RULL(0x1501242E), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_SCOM_CIDSR_SCOM , RULL(0x1501202E), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_SCOM_CIDSR_PPE , RULL(0x10E0206C0), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_CIDSR_SCOM , RULL(0x1501242E), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_SCOM_EIIR , RULL(0x1001242B), SH_UNT_EQ , SH_ACS_SCOM ); //DUPS: 1001202B, @@ -2082,13 +2166,19 @@ REG64( EQ_4_CME_SCOM_EIIR , RULL(0x1401242B SH_ACS_SCOM ); //DUPS: 1401202B, REG64( EQ_5_CME_SCOM_EIIR , RULL(0x1501242B), SH_UNT_EQ_5 , SH_ACS_SCOM ); //DUPS: 1501202B, -REG64( EX_CME_SCOM_EIIR , RULL(0x1001242B), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_CME_SCOM_EIIR , RULL(0x1001242B), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_CME_SCOM_EIIR , RULL(0x1101242B), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_CME_SCOM_EIIR , RULL(0x1201242B), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_CME_SCOM_EIIR , RULL(0x1301242B), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_CME_SCOM_EIIR , RULL(0x1401242B), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_CME_SCOM_EIIR , RULL(0x1501242B), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_CME_SCOM_EIIR , RULL(0x1001202B), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_CME_SCOM_EIIR , RULL(0x1001202B), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_1_CME_SCOM_EIIR , RULL(0x1001242B), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_2_CME_SCOM_EIIR , RULL(0x1101202B), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_3_CME_SCOM_EIIR , RULL(0x1101242B), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_4_CME_SCOM_EIIR , RULL(0x1201202B), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_5_CME_SCOM_EIIR , RULL(0x1201242B), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_6_CME_SCOM_EIIR , RULL(0x1301202B), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_7_CME_SCOM_EIIR , RULL(0x1301242B), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_8_CME_SCOM_EIIR , RULL(0x1401202B), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_9_CME_SCOM_EIIR , RULL(0x1401242B), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_10_CME_SCOM_EIIR , RULL(0x1501202B), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_11_CME_SCOM_EIIR , RULL(0x1501242B), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_CME_SCOM_FLAGS , RULL(0x10012420), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012020, @@ -2138,106 +2228,130 @@ REG64( EX_CME_SCOM_FLAGS_PPE1 , RULL(0x10901041 SH_ACS_PPE1 ); REG64( EX_CME_SCOM_FLAGS_PPE2 , RULL(0x109010410), SH_UNT_EX , SH_ACS_PPE2 ); -REG64( EX_CME_SCOM_FLAGS_SCOM , RULL(0x10012420), SH_UNT_EX , SH_ACS_SCOM_RW ); -REG64( EX_CME_SCOM_FLAGS_SCOM1 , RULL(0x10012421), SH_UNT_EX , +REG64( EX_CME_SCOM_FLAGS_SCOM , RULL(0x10012020), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_FLAGS_SCOM1 , RULL(0x10012021), SH_UNT_EX , SH_ACS_SCOM1_CLEAR ); -REG64( EX_CME_SCOM_FLAGS_SCOM2 , RULL(0x10012422), SH_UNT_EX , SH_ACS_SCOM2_OR ); +REG64( EX_CME_SCOM_FLAGS_SCOM2 , RULL(0x10012022), SH_UNT_EX , SH_ACS_SCOM2_OR ); REG64( EX_0_CME_SCOM_FLAGS_PPE , RULL(0x109010400), SH_UNT_EX_0 , SH_ACS_PPE ); REG64( EX_0_CME_SCOM_FLAGS_PPE1 , RULL(0x109010418), SH_UNT_EX_0 , SH_ACS_PPE1 ); REG64( EX_0_CME_SCOM_FLAGS_PPE2 , RULL(0x109010410), SH_UNT_EX_0 , SH_ACS_PPE2 ); -REG64( EX_0_CME_SCOM_FLAGS_SCOM , RULL(0x10012420), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); -REG64( EX_0_CME_SCOM_FLAGS_SCOM1 , RULL(0x10012421), SH_UNT_EX_0 , +REG64( EX_0_CME_SCOM_FLAGS_SCOM , RULL(0x10012020), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_FLAGS_SCOM1 , RULL(0x10012021), SH_UNT_EX_0 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_0_CME_SCOM_FLAGS_SCOM2 , RULL(0x10012422), SH_UNT_EX_0 , SH_ACS_SCOM2_OR ); +REG64( EX_0_CME_SCOM_FLAGS_SCOM2 , RULL(0x10012022), SH_UNT_EX_0 , SH_ACS_SCOM2_OR ); REG64( EX_1_CME_SCOM_FLAGS_PPE , RULL(0x109020400), SH_UNT_EX_1 , SH_ACS_PPE ); REG64( EX_1_CME_SCOM_FLAGS_PPE1 , RULL(0x109020418), SH_UNT_EX_1 , SH_ACS_PPE1 ); REG64( EX_1_CME_SCOM_FLAGS_PPE2 , RULL(0x109020410), SH_UNT_EX_1 , SH_ACS_PPE2 ); +REG64( EX_1_CME_SCOM_FLAGS_SCOM , RULL(0x10012420), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); +REG64( EX_1_CME_SCOM_FLAGS_SCOM1 , RULL(0x10012421), SH_UNT_EX_1 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_1_CME_SCOM_FLAGS_SCOM2 , RULL(0x10012422), SH_UNT_EX_1 , SH_ACS_SCOM2_OR ); REG64( EX_2_CME_SCOM_FLAGS_PPE , RULL(0x10A010400), SH_UNT_EX_2 , SH_ACS_PPE ); REG64( EX_2_CME_SCOM_FLAGS_PPE1 , RULL(0x10A010418), SH_UNT_EX_2 , SH_ACS_PPE1 ); REG64( EX_2_CME_SCOM_FLAGS_PPE2 , RULL(0x10A010410), SH_UNT_EX_2 , SH_ACS_PPE2 ); -REG64( EX_2_CME_SCOM_FLAGS_SCOM , RULL(0x11012420), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); -REG64( EX_2_CME_SCOM_FLAGS_SCOM1 , RULL(0x11012421), SH_UNT_EX_2 , +REG64( EX_2_CME_SCOM_FLAGS_SCOM , RULL(0x11012020), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_FLAGS_SCOM1 , RULL(0x11012021), SH_UNT_EX_2 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_2_CME_SCOM_FLAGS_SCOM2 , RULL(0x11012422), SH_UNT_EX_2 , SH_ACS_SCOM2_OR ); +REG64( EX_2_CME_SCOM_FLAGS_SCOM2 , RULL(0x11012022), SH_UNT_EX_2 , SH_ACS_SCOM2_OR ); REG64( EX_3_CME_SCOM_FLAGS_PPE , RULL(0x10A020400), SH_UNT_EX_3 , SH_ACS_PPE ); REG64( EX_3_CME_SCOM_FLAGS_PPE1 , RULL(0x10A020418), SH_UNT_EX_3 , SH_ACS_PPE1 ); REG64( EX_3_CME_SCOM_FLAGS_PPE2 , RULL(0x10A020410), SH_UNT_EX_3 , SH_ACS_PPE2 ); +REG64( EX_3_CME_SCOM_FLAGS_SCOM , RULL(0x11012420), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); +REG64( EX_3_CME_SCOM_FLAGS_SCOM1 , RULL(0x11012421), SH_UNT_EX_3 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_3_CME_SCOM_FLAGS_SCOM2 , RULL(0x11012422), SH_UNT_EX_3 , SH_ACS_SCOM2_OR ); REG64( EX_4_CME_SCOM_FLAGS_PPE , RULL(0x10B010400), SH_UNT_EX_4 , SH_ACS_PPE ); REG64( EX_4_CME_SCOM_FLAGS_PPE1 , RULL(0x10B010418), SH_UNT_EX_4 , SH_ACS_PPE1 ); REG64( EX_4_CME_SCOM_FLAGS_PPE2 , RULL(0x10B010410), SH_UNT_EX_4 , SH_ACS_PPE2 ); -REG64( EX_4_CME_SCOM_FLAGS_SCOM , RULL(0x12012420), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); -REG64( EX_4_CME_SCOM_FLAGS_SCOM1 , RULL(0x12012421), SH_UNT_EX_4 , +REG64( EX_4_CME_SCOM_FLAGS_SCOM , RULL(0x12012020), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_FLAGS_SCOM1 , RULL(0x12012021), SH_UNT_EX_4 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_4_CME_SCOM_FLAGS_SCOM2 , RULL(0x12012422), SH_UNT_EX_4 , SH_ACS_SCOM2_OR ); +REG64( EX_4_CME_SCOM_FLAGS_SCOM2 , RULL(0x12012022), SH_UNT_EX_4 , SH_ACS_SCOM2_OR ); REG64( EX_5_CME_SCOM_FLAGS_PPE , RULL(0x10B020400), SH_UNT_EX_5 , SH_ACS_PPE ); REG64( EX_5_CME_SCOM_FLAGS_PPE1 , RULL(0x10B020418), SH_UNT_EX_5 , SH_ACS_PPE1 ); REG64( EX_5_CME_SCOM_FLAGS_PPE2 , RULL(0x10B020410), SH_UNT_EX_5 , SH_ACS_PPE2 ); +REG64( EX_5_CME_SCOM_FLAGS_SCOM , RULL(0x12012420), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); +REG64( EX_5_CME_SCOM_FLAGS_SCOM1 , RULL(0x12012421), SH_UNT_EX_5 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_5_CME_SCOM_FLAGS_SCOM2 , RULL(0x12012422), SH_UNT_EX_5 , SH_ACS_SCOM2_OR ); REG64( EX_6_CME_SCOM_FLAGS_PPE , RULL(0x10C010400), SH_UNT_EX_6 , SH_ACS_PPE ); REG64( EX_6_CME_SCOM_FLAGS_PPE1 , RULL(0x10C010418), SH_UNT_EX_6 , SH_ACS_PPE1 ); REG64( EX_6_CME_SCOM_FLAGS_PPE2 , RULL(0x10C010410), SH_UNT_EX_6 , SH_ACS_PPE2 ); -REG64( EX_6_CME_SCOM_FLAGS_SCOM , RULL(0x13012420), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); -REG64( EX_6_CME_SCOM_FLAGS_SCOM1 , RULL(0x13012421), SH_UNT_EX_6 , +REG64( EX_6_CME_SCOM_FLAGS_SCOM , RULL(0x13012020), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_FLAGS_SCOM1 , RULL(0x13012021), SH_UNT_EX_6 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_6_CME_SCOM_FLAGS_SCOM2 , RULL(0x13012422), SH_UNT_EX_6 , SH_ACS_SCOM2_OR ); +REG64( EX_6_CME_SCOM_FLAGS_SCOM2 , RULL(0x13012022), SH_UNT_EX_6 , SH_ACS_SCOM2_OR ); REG64( EX_7_CME_SCOM_FLAGS_PPE , RULL(0x10C020400), SH_UNT_EX_7 , SH_ACS_PPE ); REG64( EX_7_CME_SCOM_FLAGS_PPE1 , RULL(0x10C020418), SH_UNT_EX_7 , SH_ACS_PPE1 ); REG64( EX_7_CME_SCOM_FLAGS_PPE2 , RULL(0x10C020410), SH_UNT_EX_7 , SH_ACS_PPE2 ); +REG64( EX_7_CME_SCOM_FLAGS_SCOM , RULL(0x13012420), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); +REG64( EX_7_CME_SCOM_FLAGS_SCOM1 , RULL(0x13012421), SH_UNT_EX_7 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_7_CME_SCOM_FLAGS_SCOM2 , RULL(0x13012422), SH_UNT_EX_7 , SH_ACS_SCOM2_OR ); REG64( EX_8_CME_SCOM_FLAGS_PPE , RULL(0x10D010400), SH_UNT_EX_8 , SH_ACS_PPE ); REG64( EX_8_CME_SCOM_FLAGS_PPE1 , RULL(0x10D010418), SH_UNT_EX_8 , SH_ACS_PPE1 ); REG64( EX_8_CME_SCOM_FLAGS_PPE2 , RULL(0x10D010410), SH_UNT_EX_8 , SH_ACS_PPE2 ); -REG64( EX_8_CME_SCOM_FLAGS_SCOM , RULL(0x14012420), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); -REG64( EX_8_CME_SCOM_FLAGS_SCOM1 , RULL(0x14012421), SH_UNT_EX_8 , +REG64( EX_8_CME_SCOM_FLAGS_SCOM , RULL(0x14012020), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_FLAGS_SCOM1 , RULL(0x14012021), SH_UNT_EX_8 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_8_CME_SCOM_FLAGS_SCOM2 , RULL(0x14012422), SH_UNT_EX_8 , SH_ACS_SCOM2_OR ); +REG64( EX_8_CME_SCOM_FLAGS_SCOM2 , RULL(0x14012022), SH_UNT_EX_8 , SH_ACS_SCOM2_OR ); REG64( EX_9_CME_SCOM_FLAGS_PPE , RULL(0x10D020400), SH_UNT_EX_9 , SH_ACS_PPE ); REG64( EX_9_CME_SCOM_FLAGS_PPE1 , RULL(0x10D020418), SH_UNT_EX_9 , SH_ACS_PPE1 ); REG64( EX_9_CME_SCOM_FLAGS_PPE2 , RULL(0x10D020410), SH_UNT_EX_9 , SH_ACS_PPE2 ); +REG64( EX_9_CME_SCOM_FLAGS_SCOM , RULL(0x14012420), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); +REG64( EX_9_CME_SCOM_FLAGS_SCOM1 , RULL(0x14012421), SH_UNT_EX_9 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_9_CME_SCOM_FLAGS_SCOM2 , RULL(0x14012422), SH_UNT_EX_9 , SH_ACS_SCOM2_OR ); REG64( EX_10_CME_SCOM_FLAGS_PPE , RULL(0x10E010400), SH_UNT_EX_10 , SH_ACS_PPE ); REG64( EX_10_CME_SCOM_FLAGS_PPE1 , RULL(0x10E010418), SH_UNT_EX_10 , SH_ACS_PPE1 ); REG64( EX_10_CME_SCOM_FLAGS_PPE2 , RULL(0x10E010410), SH_UNT_EX_10 , SH_ACS_PPE2 ); -REG64( EX_10_CME_SCOM_FLAGS_SCOM , RULL(0x15012420), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); -REG64( EX_10_CME_SCOM_FLAGS_SCOM1 , RULL(0x15012421), SH_UNT_EX_10 , +REG64( EX_10_CME_SCOM_FLAGS_SCOM , RULL(0x15012020), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_FLAGS_SCOM1 , RULL(0x15012021), SH_UNT_EX_10 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_10_CME_SCOM_FLAGS_SCOM2 , RULL(0x15012422), SH_UNT_EX_10 , SH_ACS_SCOM2_OR ); +REG64( EX_10_CME_SCOM_FLAGS_SCOM2 , RULL(0x15012022), SH_UNT_EX_10 , SH_ACS_SCOM2_OR ); REG64( EX_11_CME_SCOM_FLAGS_PPE , RULL(0x10E020400), SH_UNT_EX_11 , SH_ACS_PPE ); REG64( EX_11_CME_SCOM_FLAGS_PPE1 , RULL(0x10E020418), SH_UNT_EX_11 , SH_ACS_PPE1 ); REG64( EX_11_CME_SCOM_FLAGS_PPE2 , RULL(0x10E020410), SH_UNT_EX_11 , SH_ACS_PPE2 ); +REG64( EX_11_CME_SCOM_FLAGS_SCOM , RULL(0x15012420), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); +REG64( EX_11_CME_SCOM_FLAGS_SCOM1 , RULL(0x15012421), SH_UNT_EX_11 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_11_CME_SCOM_FLAGS_SCOM2 , RULL(0x15012422), SH_UNT_EX_11 , SH_ACS_SCOM2_OR ); REG64( EQ_CME_SCOM_FWMR , RULL(0x1001243A), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 1001203A, @@ -2281,34 +2395,58 @@ REG64( EQ_5_CME_SCOM_FWMR_CLEAR , RULL(0x1501243B SH_ACS_SCOM1_CLEAR ); //DUPS: 1501203B, REG64( EQ_5_CME_SCOM_FWMR_OR , RULL(0x1501243C), SH_UNT_EQ_5 , SH_ACS_SCOM2_OR ); //DUPS: 1501203C, -REG64( EX_CME_SCOM_FWMR , RULL(0x1001243A), SH_UNT_EX , SH_ACS_SCOM_RW ); -REG64( EX_CME_SCOM_FWMR_CLEAR , RULL(0x1001243B), SH_UNT_EX , +REG64( EX_CME_SCOM_FWMR , RULL(0x1001203A), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_FWMR_CLEAR , RULL(0x1001203B), SH_UNT_EX , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_CME_SCOM_FWMR_OR , RULL(0x1001203C), SH_UNT_EX , SH_ACS_SCOM2_OR ); +REG64( EX_0_CME_SCOM_FWMR , RULL(0x1001203A), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_FWMR_CLEAR , RULL(0x1001203B), SH_UNT_EX_0 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_0_CME_SCOM_FWMR_OR , RULL(0x1001203C), SH_UNT_EX_0 , SH_ACS_SCOM2_OR ); +REG64( EX_1_CME_SCOM_FWMR , RULL(0x1001243A), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); +REG64( EX_1_CME_SCOM_FWMR_CLEAR , RULL(0x1001243B), SH_UNT_EX_1 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_1_CME_SCOM_FWMR_OR , RULL(0x1001243C), SH_UNT_EX_1 , SH_ACS_SCOM2_OR ); +REG64( EX_2_CME_SCOM_FWMR , RULL(0x1101203A), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_FWMR_CLEAR , RULL(0x1101203B), SH_UNT_EX_2 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_CME_SCOM_FWMR_OR , RULL(0x1001243C), SH_UNT_EX , SH_ACS_SCOM2_OR ); -REG64( EX_0_CME_SCOM_FWMR , RULL(0x1001243A), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); -REG64( EX_0_CME_SCOM_FWMR_CLEAR , RULL(0x1001243B), SH_UNT_EX_0 , +REG64( EX_2_CME_SCOM_FWMR_OR , RULL(0x1101203C), SH_UNT_EX_2 , SH_ACS_SCOM2_OR ); +REG64( EX_3_CME_SCOM_FWMR , RULL(0x1101243A), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); +REG64( EX_3_CME_SCOM_FWMR_CLEAR , RULL(0x1101243B), SH_UNT_EX_3 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_0_CME_SCOM_FWMR_OR , RULL(0x1001243C), SH_UNT_EX_0 , SH_ACS_SCOM2_OR ); -REG64( EX_2_CME_SCOM_FWMR , RULL(0x1101243A), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); -REG64( EX_2_CME_SCOM_FWMR_CLEAR , RULL(0x1101243B), SH_UNT_EX_2 , +REG64( EX_3_CME_SCOM_FWMR_OR , RULL(0x1101243C), SH_UNT_EX_3 , SH_ACS_SCOM2_OR ); +REG64( EX_4_CME_SCOM_FWMR , RULL(0x1201203A), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_FWMR_CLEAR , RULL(0x1201203B), SH_UNT_EX_4 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_2_CME_SCOM_FWMR_OR , RULL(0x1101243C), SH_UNT_EX_2 , SH_ACS_SCOM2_OR ); -REG64( EX_4_CME_SCOM_FWMR , RULL(0x1201243A), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); -REG64( EX_4_CME_SCOM_FWMR_CLEAR , RULL(0x1201243B), SH_UNT_EX_4 , +REG64( EX_4_CME_SCOM_FWMR_OR , RULL(0x1201203C), SH_UNT_EX_4 , SH_ACS_SCOM2_OR ); +REG64( EX_5_CME_SCOM_FWMR , RULL(0x1201243A), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); +REG64( EX_5_CME_SCOM_FWMR_CLEAR , RULL(0x1201243B), SH_UNT_EX_5 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_4_CME_SCOM_FWMR_OR , RULL(0x1201243C), SH_UNT_EX_4 , SH_ACS_SCOM2_OR ); -REG64( EX_6_CME_SCOM_FWMR , RULL(0x1301243A), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); -REG64( EX_6_CME_SCOM_FWMR_CLEAR , RULL(0x1301243B), SH_UNT_EX_6 , +REG64( EX_5_CME_SCOM_FWMR_OR , RULL(0x1201243C), SH_UNT_EX_5 , SH_ACS_SCOM2_OR ); +REG64( EX_6_CME_SCOM_FWMR , RULL(0x1301203A), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_FWMR_CLEAR , RULL(0x1301203B), SH_UNT_EX_6 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_6_CME_SCOM_FWMR_OR , RULL(0x1301243C), SH_UNT_EX_6 , SH_ACS_SCOM2_OR ); -REG64( EX_8_CME_SCOM_FWMR , RULL(0x1401243A), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); -REG64( EX_8_CME_SCOM_FWMR_CLEAR , RULL(0x1401243B), SH_UNT_EX_8 , +REG64( EX_6_CME_SCOM_FWMR_OR , RULL(0x1301203C), SH_UNT_EX_6 , SH_ACS_SCOM2_OR ); +REG64( EX_7_CME_SCOM_FWMR , RULL(0x1301243A), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); +REG64( EX_7_CME_SCOM_FWMR_CLEAR , RULL(0x1301243B), SH_UNT_EX_7 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_8_CME_SCOM_FWMR_OR , RULL(0x1401243C), SH_UNT_EX_8 , SH_ACS_SCOM2_OR ); -REG64( EX_10_CME_SCOM_FWMR , RULL(0x1501243A), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); -REG64( EX_10_CME_SCOM_FWMR_CLEAR , RULL(0x1501243B), SH_UNT_EX_10 , +REG64( EX_7_CME_SCOM_FWMR_OR , RULL(0x1301243C), SH_UNT_EX_7 , SH_ACS_SCOM2_OR ); +REG64( EX_8_CME_SCOM_FWMR , RULL(0x1401203A), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_FWMR_CLEAR , RULL(0x1401203B), SH_UNT_EX_8 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_10_CME_SCOM_FWMR_OR , RULL(0x1501243C), SH_UNT_EX_10 , SH_ACS_SCOM2_OR ); +REG64( EX_8_CME_SCOM_FWMR_OR , RULL(0x1401203C), SH_UNT_EX_8 , SH_ACS_SCOM2_OR ); +REG64( EX_9_CME_SCOM_FWMR , RULL(0x1401243A), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); +REG64( EX_9_CME_SCOM_FWMR_CLEAR , RULL(0x1401243B), SH_UNT_EX_9 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_9_CME_SCOM_FWMR_OR , RULL(0x1401243C), SH_UNT_EX_9 , SH_ACS_SCOM2_OR ); +REG64( EX_10_CME_SCOM_FWMR , RULL(0x1501203A), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_FWMR_CLEAR , RULL(0x1501203B), SH_UNT_EX_10 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_10_CME_SCOM_FWMR_OR , RULL(0x1501203C), SH_UNT_EX_10 , SH_ACS_SCOM2_OR ); +REG64( EX_11_CME_SCOM_FWMR , RULL(0x1501243A), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); +REG64( EX_11_CME_SCOM_FWMR_CLEAR , RULL(0x1501243B), SH_UNT_EX_11 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_11_CME_SCOM_FWMR_OR , RULL(0x1501243C), SH_UNT_EX_11 , SH_ACS_SCOM2_OR ); REG64( EQ_CME_SCOM_IDCR , RULL(0x1001242D), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 1001202D, @@ -2326,37 +2464,43 @@ REG64( EQ_5_CME_SCOM_IDCR , RULL(0x1501242D SH_ACS_SCOM_RW ); //DUPS: 1501202D, REG64( EX_CME_SCOM_IDCR_PPE , RULL(0x1090106A0), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_IDCR_SCOM , RULL(0x1001242D), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_IDCR_SCOM , RULL(0x1001202D), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_IDCR_PPE , RULL(0x1090106A0), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_IDCR_SCOM , RULL(0x1001242D), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_IDCR_SCOM , RULL(0x1001202D), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_IDCR_PPE , RULL(0x1090206A0), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_IDCR_SCOM , RULL(0x1001242D), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_IDCR_PPE , RULL(0x10A0106A0), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_IDCR_SCOM , RULL(0x1101242D), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_IDCR_SCOM , RULL(0x1101202D), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_IDCR_PPE , RULL(0x10A0206A0), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_IDCR_SCOM , RULL(0x1101242D), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_IDCR_PPE , RULL(0x10B0106A0), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_IDCR_SCOM , RULL(0x1201242D), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_IDCR_SCOM , RULL(0x1201202D), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_IDCR_PPE , RULL(0x10B0206A0), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_IDCR_SCOM , RULL(0x1201242D), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_IDCR_PPE , RULL(0x10C0106A0), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_IDCR_SCOM , RULL(0x1301242D), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_IDCR_SCOM , RULL(0x1301202D), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_IDCR_PPE , RULL(0x10C0206A0), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_IDCR_SCOM , RULL(0x1301242D), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_IDCR_PPE , RULL(0x10D0106A0), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_IDCR_SCOM , RULL(0x1401242D), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_IDCR_SCOM , RULL(0x1401202D), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_IDCR_PPE , RULL(0x10D0206A0), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_IDCR_SCOM , RULL(0x1401242D), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_IDCR_PPE , RULL(0x10E0106A0), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_IDCR_SCOM , RULL(0x1501242D), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_IDCR_SCOM , RULL(0x1501202D), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_IDCR_PPE , RULL(0x10E0206A0), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_IDCR_SCOM , RULL(0x1501242D), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_LFIR , RULL(0x10012400), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012000, @@ -2400,27 +2544,45 @@ REG64( EQ_5_CME_SCOM_LFIR_AND , RULL(0x15012401 SH_ACS_SCOM1_AND ); //DUPS: 15012001, REG64( EQ_5_CME_SCOM_LFIR_OR , RULL(0x15012402), SH_UNT_EQ_5 , SH_ACS_SCOM2_OR ); //DUPS: 15012002, -REG64( EX_CME_SCOM_LFIR , RULL(0x10012400), SH_UNT_EX , SH_ACS_SCOM_RW ); -REG64( EX_CME_SCOM_LFIR_AND , RULL(0x10012401), SH_UNT_EX , SH_ACS_SCOM1_AND ); -REG64( EX_CME_SCOM_LFIR_OR , RULL(0x10012402), SH_UNT_EX , SH_ACS_SCOM2_OR ); -REG64( EX_0_CME_SCOM_LFIR , RULL(0x10012400), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); -REG64( EX_0_CME_SCOM_LFIR_AND , RULL(0x10012401), SH_UNT_EX_0 , SH_ACS_SCOM1_AND ); -REG64( EX_0_CME_SCOM_LFIR_OR , RULL(0x10012402), SH_UNT_EX_0 , SH_ACS_SCOM2_OR ); -REG64( EX_2_CME_SCOM_LFIR , RULL(0x11012400), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); -REG64( EX_2_CME_SCOM_LFIR_AND , RULL(0x11012401), SH_UNT_EX_2 , SH_ACS_SCOM1_AND ); -REG64( EX_2_CME_SCOM_LFIR_OR , RULL(0x11012402), SH_UNT_EX_2 , SH_ACS_SCOM2_OR ); -REG64( EX_4_CME_SCOM_LFIR , RULL(0x12012400), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); -REG64( EX_4_CME_SCOM_LFIR_AND , RULL(0x12012401), SH_UNT_EX_4 , SH_ACS_SCOM1_AND ); -REG64( EX_4_CME_SCOM_LFIR_OR , RULL(0x12012402), SH_UNT_EX_4 , SH_ACS_SCOM2_OR ); -REG64( EX_6_CME_SCOM_LFIR , RULL(0x13012400), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); -REG64( EX_6_CME_SCOM_LFIR_AND , RULL(0x13012401), SH_UNT_EX_6 , SH_ACS_SCOM1_AND ); -REG64( EX_6_CME_SCOM_LFIR_OR , RULL(0x13012402), SH_UNT_EX_6 , SH_ACS_SCOM2_OR ); -REG64( EX_8_CME_SCOM_LFIR , RULL(0x14012400), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); -REG64( EX_8_CME_SCOM_LFIR_AND , RULL(0x14012401), SH_UNT_EX_8 , SH_ACS_SCOM1_AND ); -REG64( EX_8_CME_SCOM_LFIR_OR , RULL(0x14012402), SH_UNT_EX_8 , SH_ACS_SCOM2_OR ); -REG64( EX_10_CME_SCOM_LFIR , RULL(0x15012400), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); -REG64( EX_10_CME_SCOM_LFIR_AND , RULL(0x15012401), SH_UNT_EX_10 , SH_ACS_SCOM1_AND ); -REG64( EX_10_CME_SCOM_LFIR_OR , RULL(0x15012402), SH_UNT_EX_10 , SH_ACS_SCOM2_OR ); +REG64( EX_CME_SCOM_LFIR , RULL(0x10012000), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_LFIR_AND , RULL(0x10012001), SH_UNT_EX , SH_ACS_SCOM1_AND ); +REG64( EX_CME_SCOM_LFIR_OR , RULL(0x10012002), SH_UNT_EX , SH_ACS_SCOM2_OR ); +REG64( EX_0_CME_SCOM_LFIR , RULL(0x10012000), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_LFIR_AND , RULL(0x10012001), SH_UNT_EX_0 , SH_ACS_SCOM1_AND ); +REG64( EX_0_CME_SCOM_LFIR_OR , RULL(0x10012002), SH_UNT_EX_0 , SH_ACS_SCOM2_OR ); +REG64( EX_1_CME_SCOM_LFIR , RULL(0x10012400), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); +REG64( EX_1_CME_SCOM_LFIR_AND , RULL(0x10012401), SH_UNT_EX_1 , SH_ACS_SCOM1_AND ); +REG64( EX_1_CME_SCOM_LFIR_OR , RULL(0x10012402), SH_UNT_EX_1 , SH_ACS_SCOM2_OR ); +REG64( EX_2_CME_SCOM_LFIR , RULL(0x11012000), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_LFIR_AND , RULL(0x11012001), SH_UNT_EX_2 , SH_ACS_SCOM1_AND ); +REG64( EX_2_CME_SCOM_LFIR_OR , RULL(0x11012002), SH_UNT_EX_2 , SH_ACS_SCOM2_OR ); +REG64( EX_3_CME_SCOM_LFIR , RULL(0x11012400), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); +REG64( EX_3_CME_SCOM_LFIR_AND , RULL(0x11012401), SH_UNT_EX_3 , SH_ACS_SCOM1_AND ); +REG64( EX_3_CME_SCOM_LFIR_OR , RULL(0x11012402), SH_UNT_EX_3 , SH_ACS_SCOM2_OR ); +REG64( EX_4_CME_SCOM_LFIR , RULL(0x12012000), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_LFIR_AND , RULL(0x12012001), SH_UNT_EX_4 , SH_ACS_SCOM1_AND ); +REG64( EX_4_CME_SCOM_LFIR_OR , RULL(0x12012002), SH_UNT_EX_4 , SH_ACS_SCOM2_OR ); +REG64( EX_5_CME_SCOM_LFIR , RULL(0x12012400), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); +REG64( EX_5_CME_SCOM_LFIR_AND , RULL(0x12012401), SH_UNT_EX_5 , SH_ACS_SCOM1_AND ); +REG64( EX_5_CME_SCOM_LFIR_OR , RULL(0x12012402), SH_UNT_EX_5 , SH_ACS_SCOM2_OR ); +REG64( EX_6_CME_SCOM_LFIR , RULL(0x13012000), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_LFIR_AND , RULL(0x13012001), SH_UNT_EX_6 , SH_ACS_SCOM1_AND ); +REG64( EX_6_CME_SCOM_LFIR_OR , RULL(0x13012002), SH_UNT_EX_6 , SH_ACS_SCOM2_OR ); +REG64( EX_7_CME_SCOM_LFIR , RULL(0x13012400), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); +REG64( EX_7_CME_SCOM_LFIR_AND , RULL(0x13012401), SH_UNT_EX_7 , SH_ACS_SCOM1_AND ); +REG64( EX_7_CME_SCOM_LFIR_OR , RULL(0x13012402), SH_UNT_EX_7 , SH_ACS_SCOM2_OR ); +REG64( EX_8_CME_SCOM_LFIR , RULL(0x14012000), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_LFIR_AND , RULL(0x14012001), SH_UNT_EX_8 , SH_ACS_SCOM1_AND ); +REG64( EX_8_CME_SCOM_LFIR_OR , RULL(0x14012002), SH_UNT_EX_8 , SH_ACS_SCOM2_OR ); +REG64( EX_9_CME_SCOM_LFIR , RULL(0x14012400), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); +REG64( EX_9_CME_SCOM_LFIR_AND , RULL(0x14012401), SH_UNT_EX_9 , SH_ACS_SCOM1_AND ); +REG64( EX_9_CME_SCOM_LFIR_OR , RULL(0x14012402), SH_UNT_EX_9 , SH_ACS_SCOM2_OR ); +REG64( EX_10_CME_SCOM_LFIR , RULL(0x15012000), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_LFIR_AND , RULL(0x15012001), SH_UNT_EX_10 , SH_ACS_SCOM1_AND ); +REG64( EX_10_CME_SCOM_LFIR_OR , RULL(0x15012002), SH_UNT_EX_10 , SH_ACS_SCOM2_OR ); +REG64( EX_11_CME_SCOM_LFIR , RULL(0x15012400), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); +REG64( EX_11_CME_SCOM_LFIR_AND , RULL(0x15012401), SH_UNT_EX_11 , SH_ACS_SCOM1_AND ); +REG64( EX_11_CME_SCOM_LFIR_OR , RULL(0x15012402), SH_UNT_EX_11 , SH_ACS_SCOM2_OR ); REG64( EQ_CME_SCOM_LFIRACT0 , RULL(0x10012406), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012006, @@ -2436,13 +2598,19 @@ REG64( EQ_4_CME_SCOM_LFIRACT0 , RULL(0x14012406 SH_ACS_SCOM_RW ); //DUPS: 14012006, REG64( EQ_5_CME_SCOM_LFIRACT0 , RULL(0x15012406), SH_UNT_EQ_5 , SH_ACS_SCOM_RW ); //DUPS: 15012006, -REG64( EX_CME_SCOM_LFIRACT0 , RULL(0x10012406), SH_UNT_EX , SH_ACS_SCOM_RW ); -REG64( EX_0_CME_SCOM_LFIRACT0 , RULL(0x10012406), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); -REG64( EX_2_CME_SCOM_LFIRACT0 , RULL(0x11012406), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); -REG64( EX_4_CME_SCOM_LFIRACT0 , RULL(0x12012406), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); -REG64( EX_6_CME_SCOM_LFIRACT0 , RULL(0x13012406), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); -REG64( EX_8_CME_SCOM_LFIRACT0 , RULL(0x14012406), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); -REG64( EX_10_CME_SCOM_LFIRACT0 , RULL(0x15012406), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_LFIRACT0 , RULL(0x10012006), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_LFIRACT0 , RULL(0x10012006), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_1_CME_SCOM_LFIRACT0 , RULL(0x10012406), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_LFIRACT0 , RULL(0x11012006), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_3_CME_SCOM_LFIRACT0 , RULL(0x11012406), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_LFIRACT0 , RULL(0x12012006), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_5_CME_SCOM_LFIRACT0 , RULL(0x12012406), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_LFIRACT0 , RULL(0x13012006), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_7_CME_SCOM_LFIRACT0 , RULL(0x13012406), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_LFIRACT0 , RULL(0x14012006), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_9_CME_SCOM_LFIRACT0 , RULL(0x14012406), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_LFIRACT0 , RULL(0x15012006), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_11_CME_SCOM_LFIRACT0 , RULL(0x15012406), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_LFIRACT1 , RULL(0x10012407), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012007, @@ -2458,13 +2626,19 @@ REG64( EQ_4_CME_SCOM_LFIRACT1 , RULL(0x14012407 SH_ACS_SCOM_RW ); //DUPS: 14012007, REG64( EQ_5_CME_SCOM_LFIRACT1 , RULL(0x15012407), SH_UNT_EQ_5 , SH_ACS_SCOM_RW ); //DUPS: 15012007, -REG64( EX_CME_SCOM_LFIRACT1 , RULL(0x10012407), SH_UNT_EX , SH_ACS_SCOM_RW ); -REG64( EX_0_CME_SCOM_LFIRACT1 , RULL(0x10012407), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); -REG64( EX_2_CME_SCOM_LFIRACT1 , RULL(0x11012407), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); -REG64( EX_4_CME_SCOM_LFIRACT1 , RULL(0x12012407), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); -REG64( EX_6_CME_SCOM_LFIRACT1 , RULL(0x13012407), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); -REG64( EX_8_CME_SCOM_LFIRACT1 , RULL(0x14012407), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); -REG64( EX_10_CME_SCOM_LFIRACT1 , RULL(0x15012407), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_LFIRACT1 , RULL(0x10012007), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_LFIRACT1 , RULL(0x10012007), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_1_CME_SCOM_LFIRACT1 , RULL(0x10012407), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_LFIRACT1 , RULL(0x11012007), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_3_CME_SCOM_LFIRACT1 , RULL(0x11012407), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_LFIRACT1 , RULL(0x12012007), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_5_CME_SCOM_LFIRACT1 , RULL(0x12012407), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_LFIRACT1 , RULL(0x13012007), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_7_CME_SCOM_LFIRACT1 , RULL(0x13012407), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_LFIRACT1 , RULL(0x14012007), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_9_CME_SCOM_LFIRACT1 , RULL(0x14012407), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_LFIRACT1 , RULL(0x15012007), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_11_CME_SCOM_LFIRACT1 , RULL(0x15012407), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_LFIRMASK , RULL(0x10012403), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012003, @@ -2508,27 +2682,45 @@ REG64( EQ_5_CME_SCOM_LFIRMASK_AND , RULL(0x15012404 SH_ACS_SCOM1_AND ); //DUPS: 15012004, REG64( EQ_5_CME_SCOM_LFIRMASK_OR , RULL(0x15012405), SH_UNT_EQ_5 , SH_ACS_SCOM2_OR ); //DUPS: 15012005, -REG64( EX_CME_SCOM_LFIRMASK , RULL(0x10012403), SH_UNT_EX , SH_ACS_SCOM_RW ); -REG64( EX_CME_SCOM_LFIRMASK_AND , RULL(0x10012404), SH_UNT_EX , SH_ACS_SCOM1_AND ); -REG64( EX_CME_SCOM_LFIRMASK_OR , RULL(0x10012405), SH_UNT_EX , SH_ACS_SCOM2_OR ); -REG64( EX_0_CME_SCOM_LFIRMASK , RULL(0x10012403), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); -REG64( EX_0_CME_SCOM_LFIRMASK_AND , RULL(0x10012404), SH_UNT_EX_0 , SH_ACS_SCOM1_AND ); -REG64( EX_0_CME_SCOM_LFIRMASK_OR , RULL(0x10012405), SH_UNT_EX_0 , SH_ACS_SCOM2_OR ); -REG64( EX_2_CME_SCOM_LFIRMASK , RULL(0x11012403), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); -REG64( EX_2_CME_SCOM_LFIRMASK_AND , RULL(0x11012404), SH_UNT_EX_2 , SH_ACS_SCOM1_AND ); -REG64( EX_2_CME_SCOM_LFIRMASK_OR , RULL(0x11012405), SH_UNT_EX_2 , SH_ACS_SCOM2_OR ); -REG64( EX_4_CME_SCOM_LFIRMASK , RULL(0x12012403), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); -REG64( EX_4_CME_SCOM_LFIRMASK_AND , RULL(0x12012404), SH_UNT_EX_4 , SH_ACS_SCOM1_AND ); -REG64( EX_4_CME_SCOM_LFIRMASK_OR , RULL(0x12012405), SH_UNT_EX_4 , SH_ACS_SCOM2_OR ); -REG64( EX_6_CME_SCOM_LFIRMASK , RULL(0x13012403), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); -REG64( EX_6_CME_SCOM_LFIRMASK_AND , RULL(0x13012404), SH_UNT_EX_6 , SH_ACS_SCOM1_AND ); -REG64( EX_6_CME_SCOM_LFIRMASK_OR , RULL(0x13012405), SH_UNT_EX_6 , SH_ACS_SCOM2_OR ); -REG64( EX_8_CME_SCOM_LFIRMASK , RULL(0x14012403), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); -REG64( EX_8_CME_SCOM_LFIRMASK_AND , RULL(0x14012404), SH_UNT_EX_8 , SH_ACS_SCOM1_AND ); -REG64( EX_8_CME_SCOM_LFIRMASK_OR , RULL(0x14012405), SH_UNT_EX_8 , SH_ACS_SCOM2_OR ); -REG64( EX_10_CME_SCOM_LFIRMASK , RULL(0x15012403), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); -REG64( EX_10_CME_SCOM_LFIRMASK_AND , RULL(0x15012404), SH_UNT_EX_10 , SH_ACS_SCOM1_AND ); -REG64( EX_10_CME_SCOM_LFIRMASK_OR , RULL(0x15012405), SH_UNT_EX_10 , SH_ACS_SCOM2_OR ); +REG64( EX_CME_SCOM_LFIRMASK , RULL(0x10012003), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_LFIRMASK_AND , RULL(0x10012004), SH_UNT_EX , SH_ACS_SCOM1_AND ); +REG64( EX_CME_SCOM_LFIRMASK_OR , RULL(0x10012005), SH_UNT_EX , SH_ACS_SCOM2_OR ); +REG64( EX_0_CME_SCOM_LFIRMASK , RULL(0x10012003), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_LFIRMASK_AND , RULL(0x10012004), SH_UNT_EX_0 , SH_ACS_SCOM1_AND ); +REG64( EX_0_CME_SCOM_LFIRMASK_OR , RULL(0x10012005), SH_UNT_EX_0 , SH_ACS_SCOM2_OR ); +REG64( EX_1_CME_SCOM_LFIRMASK , RULL(0x10012403), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); +REG64( EX_1_CME_SCOM_LFIRMASK_AND , RULL(0x10012404), SH_UNT_EX_1 , SH_ACS_SCOM1_AND ); +REG64( EX_1_CME_SCOM_LFIRMASK_OR , RULL(0x10012405), SH_UNT_EX_1 , SH_ACS_SCOM2_OR ); +REG64( EX_2_CME_SCOM_LFIRMASK , RULL(0x11012003), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_LFIRMASK_AND , RULL(0x11012004), SH_UNT_EX_2 , SH_ACS_SCOM1_AND ); +REG64( EX_2_CME_SCOM_LFIRMASK_OR , RULL(0x11012005), SH_UNT_EX_2 , SH_ACS_SCOM2_OR ); +REG64( EX_3_CME_SCOM_LFIRMASK , RULL(0x11012403), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); +REG64( EX_3_CME_SCOM_LFIRMASK_AND , RULL(0x11012404), SH_UNT_EX_3 , SH_ACS_SCOM1_AND ); +REG64( EX_3_CME_SCOM_LFIRMASK_OR , RULL(0x11012405), SH_UNT_EX_3 , SH_ACS_SCOM2_OR ); +REG64( EX_4_CME_SCOM_LFIRMASK , RULL(0x12012003), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_LFIRMASK_AND , RULL(0x12012004), SH_UNT_EX_4 , SH_ACS_SCOM1_AND ); +REG64( EX_4_CME_SCOM_LFIRMASK_OR , RULL(0x12012005), SH_UNT_EX_4 , SH_ACS_SCOM2_OR ); +REG64( EX_5_CME_SCOM_LFIRMASK , RULL(0x12012403), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); +REG64( EX_5_CME_SCOM_LFIRMASK_AND , RULL(0x12012404), SH_UNT_EX_5 , SH_ACS_SCOM1_AND ); +REG64( EX_5_CME_SCOM_LFIRMASK_OR , RULL(0x12012405), SH_UNT_EX_5 , SH_ACS_SCOM2_OR ); +REG64( EX_6_CME_SCOM_LFIRMASK , RULL(0x13012003), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_LFIRMASK_AND , RULL(0x13012004), SH_UNT_EX_6 , SH_ACS_SCOM1_AND ); +REG64( EX_6_CME_SCOM_LFIRMASK_OR , RULL(0x13012005), SH_UNT_EX_6 , SH_ACS_SCOM2_OR ); +REG64( EX_7_CME_SCOM_LFIRMASK , RULL(0x13012403), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); +REG64( EX_7_CME_SCOM_LFIRMASK_AND , RULL(0x13012404), SH_UNT_EX_7 , SH_ACS_SCOM1_AND ); +REG64( EX_7_CME_SCOM_LFIRMASK_OR , RULL(0x13012405), SH_UNT_EX_7 , SH_ACS_SCOM2_OR ); +REG64( EX_8_CME_SCOM_LFIRMASK , RULL(0x14012003), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_LFIRMASK_AND , RULL(0x14012004), SH_UNT_EX_8 , SH_ACS_SCOM1_AND ); +REG64( EX_8_CME_SCOM_LFIRMASK_OR , RULL(0x14012005), SH_UNT_EX_8 , SH_ACS_SCOM2_OR ); +REG64( EX_9_CME_SCOM_LFIRMASK , RULL(0x14012403), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); +REG64( EX_9_CME_SCOM_LFIRMASK_AND , RULL(0x14012404), SH_UNT_EX_9 , SH_ACS_SCOM1_AND ); +REG64( EX_9_CME_SCOM_LFIRMASK_OR , RULL(0x14012405), SH_UNT_EX_9 , SH_ACS_SCOM2_OR ); +REG64( EX_10_CME_SCOM_LFIRMASK , RULL(0x15012003), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_LFIRMASK_AND , RULL(0x15012004), SH_UNT_EX_10 , SH_ACS_SCOM1_AND ); +REG64( EX_10_CME_SCOM_LFIRMASK_OR , RULL(0x15012005), SH_UNT_EX_10 , SH_ACS_SCOM2_OR ); +REG64( EX_11_CME_SCOM_LFIRMASK , RULL(0x15012403), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); +REG64( EX_11_CME_SCOM_LFIRMASK_AND , RULL(0x15012404), SH_UNT_EX_11 , SH_ACS_SCOM1_AND ); +REG64( EX_11_CME_SCOM_LFIRMASK_OR , RULL(0x15012405), SH_UNT_EX_11 , SH_ACS_SCOM2_OR ); REG64( EQ_CME_SCOM_PMCRS0 , RULL(0x10012442), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012042, @@ -2546,37 +2738,43 @@ REG64( EQ_5_CME_SCOM_PMCRS0 , RULL(0x15012442 SH_ACS_SCOM_RW ); //DUPS: 15012042, REG64( EX_CME_SCOM_PMCRS0_PPE , RULL(0x109010240), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_PMCRS0_SCOM , RULL(0x10012442), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_PMCRS0_SCOM , RULL(0x10012042), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_PMCRS0_PPE , RULL(0x109010240), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_PMCRS0_SCOM , RULL(0x10012442), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_PMCRS0_SCOM , RULL(0x10012042), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_PMCRS0_PPE , RULL(0x109020240), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_PMCRS0_SCOM , RULL(0x10012442), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_PMCRS0_PPE , RULL(0x10A010240), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_PMCRS0_SCOM , RULL(0x11012442), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_PMCRS0_SCOM , RULL(0x11012042), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_PMCRS0_PPE , RULL(0x10A020240), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_PMCRS0_SCOM , RULL(0x11012442), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_PMCRS0_PPE , RULL(0x10B010240), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_PMCRS0_SCOM , RULL(0x12012442), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_PMCRS0_SCOM , RULL(0x12012042), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_PMCRS0_PPE , RULL(0x10B020240), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_PMCRS0_SCOM , RULL(0x12012442), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_PMCRS0_PPE , RULL(0x10C010240), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_PMCRS0_SCOM , RULL(0x13012442), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_PMCRS0_SCOM , RULL(0x13012042), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_PMCRS0_PPE , RULL(0x10C020240), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_PMCRS0_SCOM , RULL(0x13012442), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_PMCRS0_PPE , RULL(0x10D010240), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_PMCRS0_SCOM , RULL(0x14012442), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_PMCRS0_SCOM , RULL(0x14012042), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_PMCRS0_PPE , RULL(0x10D020240), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_PMCRS0_SCOM , RULL(0x14012442), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_PMCRS0_PPE , RULL(0x10E010240), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_PMCRS0_SCOM , RULL(0x15012442), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_PMCRS0_SCOM , RULL(0x15012042), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_PMCRS0_PPE , RULL(0x10E020240), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_PMCRS0_SCOM , RULL(0x15012442), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_PMCRS1 , RULL(0x10012443), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012043, @@ -2594,37 +2792,43 @@ REG64( EQ_5_CME_SCOM_PMCRS1 , RULL(0x15012443 SH_ACS_SCOM_RW ); //DUPS: 15012043, REG64( EX_CME_SCOM_PMCRS1_PPE , RULL(0x109010260), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_PMCRS1_SCOM , RULL(0x10012443), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_PMCRS1_SCOM , RULL(0x10012043), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_PMCRS1_PPE , RULL(0x109010260), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_PMCRS1_SCOM , RULL(0x10012443), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_PMCRS1_SCOM , RULL(0x10012043), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_PMCRS1_PPE , RULL(0x109020260), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_PMCRS1_SCOM , RULL(0x10012443), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_PMCRS1_PPE , RULL(0x10A010260), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_PMCRS1_SCOM , RULL(0x11012443), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_PMCRS1_SCOM , RULL(0x11012043), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_PMCRS1_PPE , RULL(0x10A020260), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_PMCRS1_SCOM , RULL(0x11012443), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_PMCRS1_PPE , RULL(0x10B010260), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_PMCRS1_SCOM , RULL(0x12012443), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_PMCRS1_SCOM , RULL(0x12012043), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_PMCRS1_PPE , RULL(0x10B020260), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_PMCRS1_SCOM , RULL(0x12012443), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_PMCRS1_PPE , RULL(0x10C010260), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_PMCRS1_SCOM , RULL(0x13012443), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_PMCRS1_SCOM , RULL(0x13012043), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_PMCRS1_PPE , RULL(0x10C020260), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_PMCRS1_SCOM , RULL(0x13012443), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_PMCRS1_PPE , RULL(0x10D010260), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_PMCRS1_SCOM , RULL(0x14012443), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_PMCRS1_SCOM , RULL(0x14012043), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_PMCRS1_PPE , RULL(0x10D020260), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_PMCRS1_SCOM , RULL(0x14012443), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_PMCRS1_PPE , RULL(0x10E010260), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_PMCRS1_SCOM , RULL(0x15012443), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_PMCRS1_SCOM , RULL(0x15012043), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_PMCRS1_PPE , RULL(0x10E020260), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_PMCRS1_SCOM , RULL(0x15012443), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_PMSRS0 , RULL(0x10012440), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012040, @@ -2642,37 +2846,43 @@ REG64( EQ_5_CME_SCOM_PMSRS0 , RULL(0x15012440 SH_ACS_SCOM_RW ); //DUPS: 15012040, REG64( EX_CME_SCOM_PMSRS0_PPE , RULL(0x109010200), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_PMSRS0_SCOM , RULL(0x10012440), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_PMSRS0_SCOM , RULL(0x10012040), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_PMSRS0_PPE , RULL(0x109010200), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_PMSRS0_SCOM , RULL(0x10012440), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_PMSRS0_SCOM , RULL(0x10012040), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_PMSRS0_PPE , RULL(0x109020200), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_PMSRS0_SCOM , RULL(0x10012440), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_PMSRS0_PPE , RULL(0x10A010200), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_PMSRS0_SCOM , RULL(0x11012440), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_PMSRS0_SCOM , RULL(0x11012040), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_PMSRS0_PPE , RULL(0x10A020200), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_PMSRS0_SCOM , RULL(0x11012440), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_PMSRS0_PPE , RULL(0x10B010200), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_PMSRS0_SCOM , RULL(0x12012440), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_PMSRS0_SCOM , RULL(0x12012040), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_PMSRS0_PPE , RULL(0x10B020200), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_PMSRS0_SCOM , RULL(0x12012440), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_PMSRS0_PPE , RULL(0x10C010200), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_PMSRS0_SCOM , RULL(0x13012440), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_PMSRS0_SCOM , RULL(0x13012040), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_PMSRS0_PPE , RULL(0x10C020200), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_PMSRS0_SCOM , RULL(0x13012440), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_PMSRS0_PPE , RULL(0x10D010200), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_PMSRS0_SCOM , RULL(0x14012440), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_PMSRS0_SCOM , RULL(0x14012040), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_PMSRS0_PPE , RULL(0x10D020200), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_PMSRS0_SCOM , RULL(0x14012440), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_PMSRS0_PPE , RULL(0x10E010200), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_PMSRS0_SCOM , RULL(0x15012440), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_PMSRS0_SCOM , RULL(0x15012040), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_PMSRS0_PPE , RULL(0x10E020200), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_PMSRS0_SCOM , RULL(0x15012440), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_PMSRS1 , RULL(0x10012441), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012041, @@ -2690,37 +2900,43 @@ REG64( EQ_5_CME_SCOM_PMSRS1 , RULL(0x15012441 SH_ACS_SCOM_RW ); //DUPS: 15012041, REG64( EX_CME_SCOM_PMSRS1_PPE , RULL(0x109010220), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_PMSRS1_SCOM , RULL(0x10012441), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_PMSRS1_SCOM , RULL(0x10012041), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_PMSRS1_PPE , RULL(0x109010220), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_PMSRS1_SCOM , RULL(0x10012441), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_PMSRS1_SCOM , RULL(0x10012041), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_PMSRS1_PPE , RULL(0x109020220), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_PMSRS1_SCOM , RULL(0x10012441), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_PMSRS1_PPE , RULL(0x10A010220), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_PMSRS1_SCOM , RULL(0x11012441), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_PMSRS1_SCOM , RULL(0x11012041), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_PMSRS1_PPE , RULL(0x10A020220), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_PMSRS1_SCOM , RULL(0x11012441), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_PMSRS1_PPE , RULL(0x10B010220), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_PMSRS1_SCOM , RULL(0x12012441), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_PMSRS1_SCOM , RULL(0x12012041), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_PMSRS1_PPE , RULL(0x10B020220), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_PMSRS1_SCOM , RULL(0x12012441), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_PMSRS1_PPE , RULL(0x10C010220), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_PMSRS1_SCOM , RULL(0x13012441), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_PMSRS1_SCOM , RULL(0x13012041), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_PMSRS1_PPE , RULL(0x10C020220), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_PMSRS1_SCOM , RULL(0x13012441), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_PMSRS1_PPE , RULL(0x10D010220), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_PMSRS1_SCOM , RULL(0x14012441), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_PMSRS1_SCOM , RULL(0x14012041), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_PMSRS1_PPE , RULL(0x10D020220), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_PMSRS1_SCOM , RULL(0x14012441), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_PMSRS1_PPE , RULL(0x10E010220), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_PMSRS1_SCOM , RULL(0x15012441), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_PMSRS1_SCOM , RULL(0x15012041), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_PMSRS1_PPE , RULL(0x10E020220), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_PMSRS1_SCOM , RULL(0x15012441), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_PSCRS00 , RULL(0x10012444), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012044, @@ -2738,37 +2954,43 @@ REG64( EQ_5_CME_SCOM_PSCRS00 , RULL(0x15012444 SH_ACS_SCOM_RW ); //DUPS: 15012044, REG64( EX_CME_SCOM_PSCRS00_PPE , RULL(0x109010300), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_PSCRS00_SCOM , RULL(0x10012444), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_PSCRS00_SCOM , RULL(0x10012044), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_PSCRS00_PPE , RULL(0x109010300), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_PSCRS00_SCOM , RULL(0x10012444), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_PSCRS00_SCOM , RULL(0x10012044), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_PSCRS00_PPE , RULL(0x109020300), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_PSCRS00_SCOM , RULL(0x10012444), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_PSCRS00_PPE , RULL(0x10A010300), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_PSCRS00_SCOM , RULL(0x11012444), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_PSCRS00_SCOM , RULL(0x11012044), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_PSCRS00_PPE , RULL(0x10A020300), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_PSCRS00_SCOM , RULL(0x11012444), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_PSCRS00_PPE , RULL(0x10B010300), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_PSCRS00_SCOM , RULL(0x12012444), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_PSCRS00_SCOM , RULL(0x12012044), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_PSCRS00_PPE , RULL(0x10B020300), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_PSCRS00_SCOM , RULL(0x12012444), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_PSCRS00_PPE , RULL(0x10C010300), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_PSCRS00_SCOM , RULL(0x13012444), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_PSCRS00_SCOM , RULL(0x13012044), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_PSCRS00_PPE , RULL(0x10C020300), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_PSCRS00_SCOM , RULL(0x13012444), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_PSCRS00_PPE , RULL(0x10D010300), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_PSCRS00_SCOM , RULL(0x14012444), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_PSCRS00_SCOM , RULL(0x14012044), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_PSCRS00_PPE , RULL(0x10D020300), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_PSCRS00_SCOM , RULL(0x14012444), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_PSCRS00_PPE , RULL(0x10E010300), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_PSCRS00_SCOM , RULL(0x15012444), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_PSCRS00_SCOM , RULL(0x15012044), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_PSCRS00_PPE , RULL(0x10E020300), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_PSCRS00_SCOM , RULL(0x15012444), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_PSCRS01 , RULL(0x10012445), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012045, @@ -2786,37 +3008,43 @@ REG64( EQ_5_CME_SCOM_PSCRS01 , RULL(0x15012445 SH_ACS_SCOM_RW ); //DUPS: 15012045, REG64( EX_CME_SCOM_PSCRS01_PPE , RULL(0x109010320), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_PSCRS01_SCOM , RULL(0x10012445), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_PSCRS01_SCOM , RULL(0x10012045), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_PSCRS01_PPE , RULL(0x109010320), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_PSCRS01_SCOM , RULL(0x10012445), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_PSCRS01_SCOM , RULL(0x10012045), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_PSCRS01_PPE , RULL(0x109020320), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_PSCRS01_SCOM , RULL(0x10012445), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_PSCRS01_PPE , RULL(0x10A010320), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_PSCRS01_SCOM , RULL(0x11012445), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_PSCRS01_SCOM , RULL(0x11012045), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_PSCRS01_PPE , RULL(0x10A020320), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_PSCRS01_SCOM , RULL(0x11012445), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_PSCRS01_PPE , RULL(0x10B010320), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_PSCRS01_SCOM , RULL(0x12012445), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_PSCRS01_SCOM , RULL(0x12012045), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_PSCRS01_PPE , RULL(0x10B020320), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_PSCRS01_SCOM , RULL(0x12012445), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_PSCRS01_PPE , RULL(0x10C010320), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_PSCRS01_SCOM , RULL(0x13012445), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_PSCRS01_SCOM , RULL(0x13012045), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_PSCRS01_PPE , RULL(0x10C020320), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_PSCRS01_SCOM , RULL(0x13012445), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_PSCRS01_PPE , RULL(0x10D010320), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_PSCRS01_SCOM , RULL(0x14012445), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_PSCRS01_SCOM , RULL(0x14012045), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_PSCRS01_PPE , RULL(0x10D020320), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_PSCRS01_SCOM , RULL(0x14012445), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_PSCRS01_PPE , RULL(0x10E010320), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_PSCRS01_SCOM , RULL(0x15012445), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_PSCRS01_SCOM , RULL(0x15012045), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_PSCRS01_PPE , RULL(0x10E020320), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_PSCRS01_SCOM , RULL(0x15012445), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_PSCRS02 , RULL(0x10012446), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012046, @@ -2834,37 +3062,43 @@ REG64( EQ_5_CME_SCOM_PSCRS02 , RULL(0x15012446 SH_ACS_SCOM_RW ); //DUPS: 15012046, REG64( EX_CME_SCOM_PSCRS02_PPE , RULL(0x109010340), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_PSCRS02_SCOM , RULL(0x10012446), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_PSCRS02_SCOM , RULL(0x10012046), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_PSCRS02_PPE , RULL(0x109010340), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_PSCRS02_SCOM , RULL(0x10012446), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_PSCRS02_SCOM , RULL(0x10012046), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_PSCRS02_PPE , RULL(0x109020340), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_PSCRS02_SCOM , RULL(0x10012446), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_PSCRS02_PPE , RULL(0x10A010340), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_PSCRS02_SCOM , RULL(0x11012446), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_PSCRS02_SCOM , RULL(0x11012046), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_PSCRS02_PPE , RULL(0x10A020340), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_PSCRS02_SCOM , RULL(0x11012446), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_PSCRS02_PPE , RULL(0x10B010340), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_PSCRS02_SCOM , RULL(0x12012446), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_PSCRS02_SCOM , RULL(0x12012046), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_PSCRS02_PPE , RULL(0x10B020340), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_PSCRS02_SCOM , RULL(0x12012446), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_PSCRS02_PPE , RULL(0x10C010340), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_PSCRS02_SCOM , RULL(0x13012446), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_PSCRS02_SCOM , RULL(0x13012046), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_PSCRS02_PPE , RULL(0x10C020340), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_PSCRS02_SCOM , RULL(0x13012446), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_PSCRS02_PPE , RULL(0x10D010340), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_PSCRS02_SCOM , RULL(0x14012446), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_PSCRS02_SCOM , RULL(0x14012046), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_PSCRS02_PPE , RULL(0x10D020340), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_PSCRS02_SCOM , RULL(0x14012446), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_PSCRS02_PPE , RULL(0x10E010340), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_PSCRS02_SCOM , RULL(0x15012446), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_PSCRS02_SCOM , RULL(0x15012046), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_PSCRS02_PPE , RULL(0x10E020340), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_PSCRS02_SCOM , RULL(0x15012446), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_PSCRS03 , RULL(0x10012447), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012047, @@ -2882,37 +3116,43 @@ REG64( EQ_5_CME_SCOM_PSCRS03 , RULL(0x15012447 SH_ACS_SCOM_RW ); //DUPS: 15012047, REG64( EX_CME_SCOM_PSCRS03_PPE , RULL(0x109010360), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_PSCRS03_SCOM , RULL(0x10012447), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_PSCRS03_SCOM , RULL(0x10012047), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_PSCRS03_PPE , RULL(0x109010360), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_PSCRS03_SCOM , RULL(0x10012447), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_PSCRS03_SCOM , RULL(0x10012047), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_PSCRS03_PPE , RULL(0x109020360), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_PSCRS03_SCOM , RULL(0x10012447), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_PSCRS03_PPE , RULL(0x10A010360), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_PSCRS03_SCOM , RULL(0x11012447), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_PSCRS03_SCOM , RULL(0x11012047), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_PSCRS03_PPE , RULL(0x10A020360), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_PSCRS03_SCOM , RULL(0x11012447), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_PSCRS03_PPE , RULL(0x10B010360), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_PSCRS03_SCOM , RULL(0x12012447), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_PSCRS03_SCOM , RULL(0x12012047), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_PSCRS03_PPE , RULL(0x10B020360), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_PSCRS03_SCOM , RULL(0x12012447), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_PSCRS03_PPE , RULL(0x10C010360), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_PSCRS03_SCOM , RULL(0x13012447), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_PSCRS03_SCOM , RULL(0x13012047), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_PSCRS03_PPE , RULL(0x10C020360), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_PSCRS03_SCOM , RULL(0x13012447), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_PSCRS03_PPE , RULL(0x10D010360), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_PSCRS03_SCOM , RULL(0x14012447), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_PSCRS03_SCOM , RULL(0x14012047), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_PSCRS03_PPE , RULL(0x10D020360), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_PSCRS03_SCOM , RULL(0x14012447), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_PSCRS03_PPE , RULL(0x10E010360), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_PSCRS03_SCOM , RULL(0x15012447), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_PSCRS03_SCOM , RULL(0x15012047), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_PSCRS03_PPE , RULL(0x10E020360), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_PSCRS03_SCOM , RULL(0x15012447), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_PSCRS10 , RULL(0x10012448), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012048, @@ -2930,37 +3170,43 @@ REG64( EQ_5_CME_SCOM_PSCRS10 , RULL(0x15012448 SH_ACS_SCOM_RW ); //DUPS: 15012048, REG64( EX_CME_SCOM_PSCRS10_PPE , RULL(0x109010380), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_PSCRS10_SCOM , RULL(0x10012448), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_PSCRS10_SCOM , RULL(0x10012048), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_PSCRS10_PPE , RULL(0x109010380), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_PSCRS10_SCOM , RULL(0x10012448), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_PSCRS10_SCOM , RULL(0x10012048), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_PSCRS10_PPE , RULL(0x109020380), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_PSCRS10_SCOM , RULL(0x10012448), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_PSCRS10_PPE , RULL(0x10A010380), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_PSCRS10_SCOM , RULL(0x11012448), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_PSCRS10_SCOM , RULL(0x11012048), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_PSCRS10_PPE , RULL(0x10A020380), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_PSCRS10_SCOM , RULL(0x11012448), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_PSCRS10_PPE , RULL(0x10B010380), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_PSCRS10_SCOM , RULL(0x12012448), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_PSCRS10_SCOM , RULL(0x12012048), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_PSCRS10_PPE , RULL(0x10B020380), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_PSCRS10_SCOM , RULL(0x12012448), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_PSCRS10_PPE , RULL(0x10C010380), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_PSCRS10_SCOM , RULL(0x13012448), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_PSCRS10_SCOM , RULL(0x13012048), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_PSCRS10_PPE , RULL(0x10C020380), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_PSCRS10_SCOM , RULL(0x13012448), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_PSCRS10_PPE , RULL(0x10D010380), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_PSCRS10_SCOM , RULL(0x14012448), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_PSCRS10_SCOM , RULL(0x14012048), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_PSCRS10_PPE , RULL(0x10D020380), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_PSCRS10_SCOM , RULL(0x14012448), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_PSCRS10_PPE , RULL(0x10E010380), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_PSCRS10_SCOM , RULL(0x15012448), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_PSCRS10_SCOM , RULL(0x15012048), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_PSCRS10_PPE , RULL(0x10E020380), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_PSCRS10_SCOM , RULL(0x15012448), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_PSCRS11 , RULL(0x10012449), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012049, @@ -2978,37 +3224,43 @@ REG64( EQ_5_CME_SCOM_PSCRS11 , RULL(0x15012449 SH_ACS_SCOM_RW ); //DUPS: 15012049, REG64( EX_CME_SCOM_PSCRS11_PPE , RULL(0x1090103A0), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_PSCRS11_SCOM , RULL(0x10012449), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_PSCRS11_SCOM , RULL(0x10012049), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_PSCRS11_PPE , RULL(0x1090103A0), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_PSCRS11_SCOM , RULL(0x10012449), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_PSCRS11_SCOM , RULL(0x10012049), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_PSCRS11_PPE , RULL(0x1090203A0), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_PSCRS11_SCOM , RULL(0x10012449), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_PSCRS11_PPE , RULL(0x10A0103A0), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_PSCRS11_SCOM , RULL(0x11012449), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_PSCRS11_SCOM , RULL(0x11012049), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_PSCRS11_PPE , RULL(0x10A0203A0), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_PSCRS11_SCOM , RULL(0x11012449), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_PSCRS11_PPE , RULL(0x10B0103A0), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_PSCRS11_SCOM , RULL(0x12012449), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_PSCRS11_SCOM , RULL(0x12012049), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_PSCRS11_PPE , RULL(0x10B0203A0), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_PSCRS11_SCOM , RULL(0x12012449), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_PSCRS11_PPE , RULL(0x10C0103A0), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_PSCRS11_SCOM , RULL(0x13012449), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_PSCRS11_SCOM , RULL(0x13012049), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_PSCRS11_PPE , RULL(0x10C0203A0), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_PSCRS11_SCOM , RULL(0x13012449), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_PSCRS11_PPE , RULL(0x10D0103A0), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_PSCRS11_SCOM , RULL(0x14012449), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_PSCRS11_SCOM , RULL(0x14012049), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_PSCRS11_PPE , RULL(0x10D0203A0), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_PSCRS11_SCOM , RULL(0x14012449), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_PSCRS11_PPE , RULL(0x10E0103A0), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_PSCRS11_SCOM , RULL(0x15012449), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_PSCRS11_SCOM , RULL(0x15012049), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_PSCRS11_PPE , RULL(0x10E0203A0), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_PSCRS11_SCOM , RULL(0x15012449), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_PSCRS12 , RULL(0x1001244A), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 1001204A, @@ -3026,37 +3278,43 @@ REG64( EQ_5_CME_SCOM_PSCRS12 , RULL(0x1501244A SH_ACS_SCOM_RW ); //DUPS: 1501204A, REG64( EX_CME_SCOM_PSCRS12_PPE , RULL(0x1090103C0), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_PSCRS12_SCOM , RULL(0x1001244A), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_PSCRS12_SCOM , RULL(0x1001204A), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_PSCRS12_PPE , RULL(0x1090103C0), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_PSCRS12_SCOM , RULL(0x1001244A), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_PSCRS12_SCOM , RULL(0x1001204A), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_PSCRS12_PPE , RULL(0x1090203C0), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_PSCRS12_SCOM , RULL(0x1001244A), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_PSCRS12_PPE , RULL(0x10A0103C0), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_PSCRS12_SCOM , RULL(0x1101244A), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_PSCRS12_SCOM , RULL(0x1101204A), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_PSCRS12_PPE , RULL(0x10A0203C0), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_PSCRS12_SCOM , RULL(0x1101244A), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_PSCRS12_PPE , RULL(0x10B0103C0), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_PSCRS12_SCOM , RULL(0x1201244A), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_PSCRS12_SCOM , RULL(0x1201204A), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_PSCRS12_PPE , RULL(0x10B0203C0), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_PSCRS12_SCOM , RULL(0x1201244A), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_PSCRS12_PPE , RULL(0x10C0103C0), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_PSCRS12_SCOM , RULL(0x1301244A), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_PSCRS12_SCOM , RULL(0x1301204A), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_PSCRS12_PPE , RULL(0x10C0203C0), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_PSCRS12_SCOM , RULL(0x1301244A), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_PSCRS12_PPE , RULL(0x10D0103C0), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_PSCRS12_SCOM , RULL(0x1401244A), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_PSCRS12_SCOM , RULL(0x1401204A), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_PSCRS12_PPE , RULL(0x10D0203C0), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_PSCRS12_SCOM , RULL(0x1401244A), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_PSCRS12_PPE , RULL(0x10E0103C0), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_PSCRS12_SCOM , RULL(0x1501244A), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_PSCRS12_SCOM , RULL(0x1501204A), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_PSCRS12_PPE , RULL(0x10E0203C0), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_PSCRS12_SCOM , RULL(0x1501244A), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_PSCRS13 , RULL(0x1001244B), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 1001204B, @@ -3074,37 +3332,43 @@ REG64( EQ_5_CME_SCOM_PSCRS13 , RULL(0x1501244B SH_ACS_SCOM_RW ); //DUPS: 1501204B, REG64( EX_CME_SCOM_PSCRS13_PPE , RULL(0x1090103E0), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_PSCRS13_SCOM , RULL(0x1001244B), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_PSCRS13_SCOM , RULL(0x1001204B), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_PSCRS13_PPE , RULL(0x1090103E0), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_PSCRS13_SCOM , RULL(0x1001244B), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_PSCRS13_SCOM , RULL(0x1001204B), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_PSCRS13_PPE , RULL(0x1090203E0), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_PSCRS13_SCOM , RULL(0x1001244B), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_PSCRS13_PPE , RULL(0x10A0103E0), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_PSCRS13_SCOM , RULL(0x1101244B), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_PSCRS13_SCOM , RULL(0x1101204B), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_PSCRS13_PPE , RULL(0x10A0203E0), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_PSCRS13_SCOM , RULL(0x1101244B), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_PSCRS13_PPE , RULL(0x10B0103E0), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_PSCRS13_SCOM , RULL(0x1201244B), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_PSCRS13_SCOM , RULL(0x1201204B), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_PSCRS13_PPE , RULL(0x10B0203E0), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_PSCRS13_SCOM , RULL(0x1201244B), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_PSCRS13_PPE , RULL(0x10C0103E0), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_PSCRS13_SCOM , RULL(0x1301244B), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_PSCRS13_SCOM , RULL(0x1301204B), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_PSCRS13_PPE , RULL(0x10C0203E0), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_PSCRS13_SCOM , RULL(0x1301244B), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_PSCRS13_PPE , RULL(0x10D0103E0), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_PSCRS13_SCOM , RULL(0x1401244B), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_PSCRS13_SCOM , RULL(0x1401204B), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_PSCRS13_PPE , RULL(0x10D0203E0), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_PSCRS13_SCOM , RULL(0x1401244B), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_PSCRS13_PPE , RULL(0x10E0103E0), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_PSCRS13_SCOM , RULL(0x1501244B), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_PSCRS13_SCOM , RULL(0x1501204B), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_PSCRS13_PPE , RULL(0x10E0203E0), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_PSCRS13_SCOM , RULL(0x1501244B), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_QFMR , RULL(0x10012432), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 10012032, @@ -3122,37 +3386,43 @@ REG64( EQ_5_CME_SCOM_QFMR , RULL(0x15012432 SH_ACS_SCOM_RO ); //DUPS: 15012032, REG64( EX_CME_SCOM_QFMR_PPE , RULL(0x109010140), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_QFMR_SCOM , RULL(0x10012432), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_SCOM_QFMR_SCOM , RULL(0x10012032), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_SCOM_QFMR_PPE , RULL(0x109010140), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_QFMR_SCOM , RULL(0x10012432), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_SCOM_QFMR_SCOM , RULL(0x10012032), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_SCOM_QFMR_PPE , RULL(0x109020140), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_QFMR_SCOM , RULL(0x10012432), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_SCOM_QFMR_PPE , RULL(0x10A010140), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_QFMR_SCOM , RULL(0x11012432), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_SCOM_QFMR_SCOM , RULL(0x11012032), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_SCOM_QFMR_PPE , RULL(0x10A020140), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_QFMR_SCOM , RULL(0x11012432), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_SCOM_QFMR_PPE , RULL(0x10B010140), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_QFMR_SCOM , RULL(0x12012432), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_SCOM_QFMR_SCOM , RULL(0x12012032), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_SCOM_QFMR_PPE , RULL(0x10B020140), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_QFMR_SCOM , RULL(0x12012432), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_SCOM_QFMR_PPE , RULL(0x10C010140), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_QFMR_SCOM , RULL(0x13012432), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_SCOM_QFMR_SCOM , RULL(0x13012032), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_SCOM_QFMR_PPE , RULL(0x10C020140), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_QFMR_SCOM , RULL(0x13012432), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_SCOM_QFMR_PPE , RULL(0x10D010140), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_QFMR_SCOM , RULL(0x14012432), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_SCOM_QFMR_SCOM , RULL(0x14012032), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_SCOM_QFMR_PPE , RULL(0x10D020140), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_QFMR_SCOM , RULL(0x14012432), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_SCOM_QFMR_PPE , RULL(0x10E010140), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_QFMR_SCOM , RULL(0x15012432), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_SCOM_QFMR_SCOM , RULL(0x15012032), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_SCOM_QFMR_PPE , RULL(0x10E020140), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_QFMR_SCOM , RULL(0x15012432), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_SCOM_QIDSR , RULL(0x1001242F), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 1001202F, @@ -3170,37 +3440,43 @@ REG64( EQ_5_CME_SCOM_QIDSR , RULL(0x1501242F SH_ACS_SCOM_RO ); //DUPS: 1501202F, REG64( EX_CME_SCOM_QIDSR_PPE , RULL(0x1090106E0), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_QIDSR_SCOM , RULL(0x1001242F), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_SCOM_QIDSR_SCOM , RULL(0x1001202F), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_SCOM_QIDSR_PPE , RULL(0x1090106E0), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_QIDSR_SCOM , RULL(0x1001242F), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_SCOM_QIDSR_SCOM , RULL(0x1001202F), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_SCOM_QIDSR_PPE , RULL(0x1090206E0), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_QIDSR_SCOM , RULL(0x1001242F), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_SCOM_QIDSR_PPE , RULL(0x10A0106E0), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_QIDSR_SCOM , RULL(0x1101242F), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_SCOM_QIDSR_SCOM , RULL(0x1101202F), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_SCOM_QIDSR_PPE , RULL(0x10A0206E0), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_QIDSR_SCOM , RULL(0x1101242F), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_SCOM_QIDSR_PPE , RULL(0x10B0106E0), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_QIDSR_SCOM , RULL(0x1201242F), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_SCOM_QIDSR_SCOM , RULL(0x1201202F), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_SCOM_QIDSR_PPE , RULL(0x10B0206E0), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_QIDSR_SCOM , RULL(0x1201242F), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_SCOM_QIDSR_PPE , RULL(0x10C0106E0), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_QIDSR_SCOM , RULL(0x1301242F), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_SCOM_QIDSR_SCOM , RULL(0x1301202F), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_SCOM_QIDSR_PPE , RULL(0x10C0206E0), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_QIDSR_SCOM , RULL(0x1301242F), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_SCOM_QIDSR_PPE , RULL(0x10D0106E0), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_QIDSR_SCOM , RULL(0x1401242F), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_SCOM_QIDSR_SCOM , RULL(0x1401202F), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_SCOM_QIDSR_PPE , RULL(0x10D0206E0), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_QIDSR_SCOM , RULL(0x1401242F), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_SCOM_QIDSR_PPE , RULL(0x10E0106E0), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_QIDSR_SCOM , RULL(0x1501242F), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_SCOM_QIDSR_SCOM , RULL(0x1501202F), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_SCOM_QIDSR_PPE , RULL(0x10E0206E0), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_QIDSR_SCOM , RULL(0x1501242F), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_SCOM_SICR_SCOM , RULL(0x1001243D), SH_UNT_EQ , SH_ACS_SCOM ); //DUPS: 1001203D, @@ -3250,99 +3526,117 @@ REG64( EX_CME_SCOM_SICR_PPE1 , RULL(0x10901051 SH_ACS_PPE1 ); REG64( EX_CME_SCOM_SICR_PPE2 , RULL(0x109010510), SH_UNT_EX , SH_ACS_PPE2 ); -REG64( EX_CME_SCOM_SICR_SCOM , RULL(0x1001243D), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_CME_SCOM_SICR_SCOM1 , RULL(0x1001243E), SH_UNT_EX , SH_ACS_SCOM1 ); -REG64( EX_CME_SCOM_SICR_SCOM2 , RULL(0x1001243F), SH_UNT_EX , SH_ACS_SCOM2 ); +REG64( EX_CME_SCOM_SICR_SCOM , RULL(0x1001203D), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_CME_SCOM_SICR_SCOM1 , RULL(0x1001203E), SH_UNT_EX , SH_ACS_SCOM1 ); +REG64( EX_CME_SCOM_SICR_SCOM2 , RULL(0x1001203F), SH_UNT_EX , SH_ACS_SCOM2 ); REG64( EX_0_CME_SCOM_SICR_PPE , RULL(0x109010500), SH_UNT_EX_0 , SH_ACS_PPE ); REG64( EX_0_CME_SCOM_SICR_PPE1 , RULL(0x109010518), SH_UNT_EX_0 , SH_ACS_PPE1 ); REG64( EX_0_CME_SCOM_SICR_PPE2 , RULL(0x109010510), SH_UNT_EX_0 , SH_ACS_PPE2 ); -REG64( EX_0_CME_SCOM_SICR_SCOM , RULL(0x1001243D), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_0_CME_SCOM_SICR_SCOM1 , RULL(0x1001243E), SH_UNT_EX_0 , SH_ACS_SCOM1 ); -REG64( EX_0_CME_SCOM_SICR_SCOM2 , RULL(0x1001243F), SH_UNT_EX_0 , SH_ACS_SCOM2 ); +REG64( EX_0_CME_SCOM_SICR_SCOM , RULL(0x1001203D), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_0_CME_SCOM_SICR_SCOM1 , RULL(0x1001203E), SH_UNT_EX_0 , SH_ACS_SCOM1 ); +REG64( EX_0_CME_SCOM_SICR_SCOM2 , RULL(0x1001203F), SH_UNT_EX_0 , SH_ACS_SCOM2 ); REG64( EX_1_CME_SCOM_SICR_PPE , RULL(0x109020500), SH_UNT_EX_1 , SH_ACS_PPE ); REG64( EX_1_CME_SCOM_SICR_PPE1 , RULL(0x109020518), SH_UNT_EX_1 , SH_ACS_PPE1 ); REG64( EX_1_CME_SCOM_SICR_PPE2 , RULL(0x109020510), SH_UNT_EX_1 , SH_ACS_PPE2 ); +REG64( EX_1_CME_SCOM_SICR_SCOM , RULL(0x1001243D), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_1_CME_SCOM_SICR_SCOM1 , RULL(0x1001243E), SH_UNT_EX_1 , SH_ACS_SCOM1 ); +REG64( EX_1_CME_SCOM_SICR_SCOM2 , RULL(0x1001243F), SH_UNT_EX_1 , SH_ACS_SCOM2 ); REG64( EX_2_CME_SCOM_SICR_PPE , RULL(0x10A010500), SH_UNT_EX_2 , SH_ACS_PPE ); REG64( EX_2_CME_SCOM_SICR_PPE1 , RULL(0x10A010518), SH_UNT_EX_2 , SH_ACS_PPE1 ); REG64( EX_2_CME_SCOM_SICR_PPE2 , RULL(0x10A010510), SH_UNT_EX_2 , SH_ACS_PPE2 ); -REG64( EX_2_CME_SCOM_SICR_SCOM , RULL(0x1101243D), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_2_CME_SCOM_SICR_SCOM1 , RULL(0x1101243E), SH_UNT_EX_2 , SH_ACS_SCOM1 ); -REG64( EX_2_CME_SCOM_SICR_SCOM2 , RULL(0x1101243F), SH_UNT_EX_2 , SH_ACS_SCOM2 ); +REG64( EX_2_CME_SCOM_SICR_SCOM , RULL(0x1101203D), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_2_CME_SCOM_SICR_SCOM1 , RULL(0x1101203E), SH_UNT_EX_2 , SH_ACS_SCOM1 ); +REG64( EX_2_CME_SCOM_SICR_SCOM2 , RULL(0x1101203F), SH_UNT_EX_2 , SH_ACS_SCOM2 ); REG64( EX_3_CME_SCOM_SICR_PPE , RULL(0x10A020500), SH_UNT_EX_3 , SH_ACS_PPE ); REG64( EX_3_CME_SCOM_SICR_PPE1 , RULL(0x10A020518), SH_UNT_EX_3 , SH_ACS_PPE1 ); REG64( EX_3_CME_SCOM_SICR_PPE2 , RULL(0x10A020510), SH_UNT_EX_3 , SH_ACS_PPE2 ); +REG64( EX_3_CME_SCOM_SICR_SCOM , RULL(0x1101243D), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_3_CME_SCOM_SICR_SCOM1 , RULL(0x1101243E), SH_UNT_EX_3 , SH_ACS_SCOM1 ); +REG64( EX_3_CME_SCOM_SICR_SCOM2 , RULL(0x1101243F), SH_UNT_EX_3 , SH_ACS_SCOM2 ); REG64( EX_4_CME_SCOM_SICR_PPE , RULL(0x10B010500), SH_UNT_EX_4 , SH_ACS_PPE ); REG64( EX_4_CME_SCOM_SICR_PPE1 , RULL(0x10B010518), SH_UNT_EX_4 , SH_ACS_PPE1 ); REG64( EX_4_CME_SCOM_SICR_PPE2 , RULL(0x10B010510), SH_UNT_EX_4 , SH_ACS_PPE2 ); -REG64( EX_4_CME_SCOM_SICR_SCOM , RULL(0x1201243D), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_4_CME_SCOM_SICR_SCOM1 , RULL(0x1201243E), SH_UNT_EX_4 , SH_ACS_SCOM1 ); -REG64( EX_4_CME_SCOM_SICR_SCOM2 , RULL(0x1201243F), SH_UNT_EX_4 , SH_ACS_SCOM2 ); +REG64( EX_4_CME_SCOM_SICR_SCOM , RULL(0x1201203D), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_4_CME_SCOM_SICR_SCOM1 , RULL(0x1201203E), SH_UNT_EX_4 , SH_ACS_SCOM1 ); +REG64( EX_4_CME_SCOM_SICR_SCOM2 , RULL(0x1201203F), SH_UNT_EX_4 , SH_ACS_SCOM2 ); REG64( EX_5_CME_SCOM_SICR_PPE , RULL(0x10B020500), SH_UNT_EX_5 , SH_ACS_PPE ); REG64( EX_5_CME_SCOM_SICR_PPE1 , RULL(0x10B020518), SH_UNT_EX_5 , SH_ACS_PPE1 ); REG64( EX_5_CME_SCOM_SICR_PPE2 , RULL(0x10B020510), SH_UNT_EX_5 , SH_ACS_PPE2 ); +REG64( EX_5_CME_SCOM_SICR_SCOM , RULL(0x1201243D), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_5_CME_SCOM_SICR_SCOM1 , RULL(0x1201243E), SH_UNT_EX_5 , SH_ACS_SCOM1 ); +REG64( EX_5_CME_SCOM_SICR_SCOM2 , RULL(0x1201243F), SH_UNT_EX_5 , SH_ACS_SCOM2 ); REG64( EX_6_CME_SCOM_SICR_PPE , RULL(0x10C010500), SH_UNT_EX_6 , SH_ACS_PPE ); REG64( EX_6_CME_SCOM_SICR_PPE1 , RULL(0x10C010518), SH_UNT_EX_6 , SH_ACS_PPE1 ); REG64( EX_6_CME_SCOM_SICR_PPE2 , RULL(0x10C010510), SH_UNT_EX_6 , SH_ACS_PPE2 ); -REG64( EX_6_CME_SCOM_SICR_SCOM , RULL(0x1301243D), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_6_CME_SCOM_SICR_SCOM1 , RULL(0x1301243E), SH_UNT_EX_6 , SH_ACS_SCOM1 ); -REG64( EX_6_CME_SCOM_SICR_SCOM2 , RULL(0x1301243F), SH_UNT_EX_6 , SH_ACS_SCOM2 ); +REG64( EX_6_CME_SCOM_SICR_SCOM , RULL(0x1301203D), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_6_CME_SCOM_SICR_SCOM1 , RULL(0x1301203E), SH_UNT_EX_6 , SH_ACS_SCOM1 ); +REG64( EX_6_CME_SCOM_SICR_SCOM2 , RULL(0x1301203F), SH_UNT_EX_6 , SH_ACS_SCOM2 ); REG64( EX_7_CME_SCOM_SICR_PPE , RULL(0x10C020500), SH_UNT_EX_7 , SH_ACS_PPE ); REG64( EX_7_CME_SCOM_SICR_PPE1 , RULL(0x10C020518), SH_UNT_EX_7 , SH_ACS_PPE1 ); REG64( EX_7_CME_SCOM_SICR_PPE2 , RULL(0x10C020510), SH_UNT_EX_7 , SH_ACS_PPE2 ); +REG64( EX_7_CME_SCOM_SICR_SCOM , RULL(0x1301243D), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_7_CME_SCOM_SICR_SCOM1 , RULL(0x1301243E), SH_UNT_EX_7 , SH_ACS_SCOM1 ); +REG64( EX_7_CME_SCOM_SICR_SCOM2 , RULL(0x1301243F), SH_UNT_EX_7 , SH_ACS_SCOM2 ); REG64( EX_8_CME_SCOM_SICR_PPE , RULL(0x10D010500), SH_UNT_EX_8 , SH_ACS_PPE ); REG64( EX_8_CME_SCOM_SICR_PPE1 , RULL(0x10D010518), SH_UNT_EX_8 , SH_ACS_PPE1 ); REG64( EX_8_CME_SCOM_SICR_PPE2 , RULL(0x10D010510), SH_UNT_EX_8 , SH_ACS_PPE2 ); -REG64( EX_8_CME_SCOM_SICR_SCOM , RULL(0x1401243D), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_8_CME_SCOM_SICR_SCOM1 , RULL(0x1401243E), SH_UNT_EX_8 , SH_ACS_SCOM1 ); -REG64( EX_8_CME_SCOM_SICR_SCOM2 , RULL(0x1401243F), SH_UNT_EX_8 , SH_ACS_SCOM2 ); +REG64( EX_8_CME_SCOM_SICR_SCOM , RULL(0x1401203D), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_8_CME_SCOM_SICR_SCOM1 , RULL(0x1401203E), SH_UNT_EX_8 , SH_ACS_SCOM1 ); +REG64( EX_8_CME_SCOM_SICR_SCOM2 , RULL(0x1401203F), SH_UNT_EX_8 , SH_ACS_SCOM2 ); REG64( EX_9_CME_SCOM_SICR_PPE , RULL(0x10D020500), SH_UNT_EX_9 , SH_ACS_PPE ); REG64( EX_9_CME_SCOM_SICR_PPE1 , RULL(0x10D020518), SH_UNT_EX_9 , SH_ACS_PPE1 ); REG64( EX_9_CME_SCOM_SICR_PPE2 , RULL(0x10D020510), SH_UNT_EX_9 , SH_ACS_PPE2 ); +REG64( EX_9_CME_SCOM_SICR_SCOM , RULL(0x1401243D), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_9_CME_SCOM_SICR_SCOM1 , RULL(0x1401243E), SH_UNT_EX_9 , SH_ACS_SCOM1 ); +REG64( EX_9_CME_SCOM_SICR_SCOM2 , RULL(0x1401243F), SH_UNT_EX_9 , SH_ACS_SCOM2 ); REG64( EX_10_CME_SCOM_SICR_PPE , RULL(0x10E010500), SH_UNT_EX_10 , SH_ACS_PPE ); REG64( EX_10_CME_SCOM_SICR_PPE1 , RULL(0x10E010518), SH_UNT_EX_10 , SH_ACS_PPE1 ); REG64( EX_10_CME_SCOM_SICR_PPE2 , RULL(0x10E010510), SH_UNT_EX_10 , SH_ACS_PPE2 ); -REG64( EX_10_CME_SCOM_SICR_SCOM , RULL(0x1501243D), SH_UNT_EX_10 , SH_ACS_SCOM ); -REG64( EX_10_CME_SCOM_SICR_SCOM1 , RULL(0x1501243E), SH_UNT_EX_10 , SH_ACS_SCOM1 ); -REG64( EX_10_CME_SCOM_SICR_SCOM2 , RULL(0x1501243F), SH_UNT_EX_10 , SH_ACS_SCOM2 ); +REG64( EX_10_CME_SCOM_SICR_SCOM , RULL(0x1501203D), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_10_CME_SCOM_SICR_SCOM1 , RULL(0x1501203E), SH_UNT_EX_10 , SH_ACS_SCOM1 ); +REG64( EX_10_CME_SCOM_SICR_SCOM2 , RULL(0x1501203F), SH_UNT_EX_10 , SH_ACS_SCOM2 ); REG64( EX_11_CME_SCOM_SICR_PPE , RULL(0x10E020500), SH_UNT_EX_11 , SH_ACS_PPE ); REG64( EX_11_CME_SCOM_SICR_PPE1 , RULL(0x10E020518), SH_UNT_EX_11 , SH_ACS_PPE1 ); REG64( EX_11_CME_SCOM_SICR_PPE2 , RULL(0x10E020510), SH_UNT_EX_11 , SH_ACS_PPE2 ); +REG64( EX_11_CME_SCOM_SICR_SCOM , RULL(0x1501243D), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_11_CME_SCOM_SICR_SCOM1 , RULL(0x1501243E), SH_UNT_EX_11 , SH_ACS_SCOM1 ); +REG64( EX_11_CME_SCOM_SICR_SCOM2 , RULL(0x1501243F), SH_UNT_EX_11 , SH_ACS_SCOM2 ); REG64( EQ_CME_SCOM_SRTCH0 , RULL(0x10012423), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012023, @@ -3360,37 +3654,43 @@ REG64( EQ_5_CME_SCOM_SRTCH0 , RULL(0x15012423 SH_ACS_SCOM_RW ); //DUPS: 15012023, REG64( EX_CME_SCOM_SRTCH0_PPE , RULL(0x109010420), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_SRTCH0_SCOM , RULL(0x10012423), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_SRTCH0_SCOM , RULL(0x10012023), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_SRTCH0_PPE , RULL(0x109010420), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_SRTCH0_SCOM , RULL(0x10012423), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_SRTCH0_SCOM , RULL(0x10012023), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_SRTCH0_PPE , RULL(0x109020420), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_SRTCH0_SCOM , RULL(0x10012423), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_SRTCH0_PPE , RULL(0x10A010420), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_SRTCH0_SCOM , RULL(0x11012423), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_SRTCH0_SCOM , RULL(0x11012023), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_SRTCH0_PPE , RULL(0x10A020420), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_SRTCH0_SCOM , RULL(0x11012423), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_SRTCH0_PPE , RULL(0x10B010420), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_SRTCH0_SCOM , RULL(0x12012423), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_SRTCH0_SCOM , RULL(0x12012023), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_SRTCH0_PPE , RULL(0x10B020420), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_SRTCH0_SCOM , RULL(0x12012423), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_SRTCH0_PPE , RULL(0x10C010420), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_SRTCH0_SCOM , RULL(0x13012423), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_SRTCH0_SCOM , RULL(0x13012023), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_SRTCH0_PPE , RULL(0x10C020420), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_SRTCH0_SCOM , RULL(0x13012423), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_SRTCH0_PPE , RULL(0x10D010420), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_SRTCH0_SCOM , RULL(0x14012423), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_SRTCH0_SCOM , RULL(0x14012023), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_SRTCH0_PPE , RULL(0x10D020420), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_SRTCH0_SCOM , RULL(0x14012423), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_SRTCH0_PPE , RULL(0x10E010420), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_SRTCH0_SCOM , RULL(0x15012423), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_SRTCH0_SCOM , RULL(0x15012023), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_SRTCH0_PPE , RULL(0x10E020420), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_SRTCH0_SCOM , RULL(0x15012423), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_SRTCH1 , RULL(0x10012424), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012024, @@ -3408,37 +3708,43 @@ REG64( EQ_5_CME_SCOM_SRTCH1 , RULL(0x15012424 SH_ACS_SCOM_RW ); //DUPS: 15012024, REG64( EX_CME_SCOM_SRTCH1_PPE , RULL(0x109010440), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_SRTCH1_SCOM , RULL(0x10012424), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_SRTCH1_SCOM , RULL(0x10012024), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_SRTCH1_PPE , RULL(0x109010440), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_SRTCH1_SCOM , RULL(0x10012424), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_SRTCH1_SCOM , RULL(0x10012024), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_SRTCH1_PPE , RULL(0x109020440), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_SRTCH1_SCOM , RULL(0x10012424), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_SRTCH1_PPE , RULL(0x10A010440), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_SRTCH1_SCOM , RULL(0x11012424), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_SRTCH1_SCOM , RULL(0x11012024), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_SRTCH1_PPE , RULL(0x10A020440), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_SRTCH1_SCOM , RULL(0x11012424), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_SRTCH1_PPE , RULL(0x10B010440), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_SRTCH1_SCOM , RULL(0x12012424), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_SRTCH1_SCOM , RULL(0x12012024), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_SRTCH1_PPE , RULL(0x10B020440), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_SRTCH1_SCOM , RULL(0x12012424), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_SRTCH1_PPE , RULL(0x10C010440), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_SRTCH1_SCOM , RULL(0x13012424), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_SRTCH1_SCOM , RULL(0x13012024), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_SRTCH1_PPE , RULL(0x10C020440), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_SRTCH1_SCOM , RULL(0x13012424), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_SRTCH1_PPE , RULL(0x10D010440), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_SRTCH1_SCOM , RULL(0x14012424), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_SRTCH1_SCOM , RULL(0x14012024), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_SRTCH1_PPE , RULL(0x10D020440), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_SRTCH1_SCOM , RULL(0x14012424), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_SRTCH1_PPE , RULL(0x10E010440), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_SRTCH1_SCOM , RULL(0x15012424), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_SRTCH1_SCOM , RULL(0x15012024), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_SRTCH1_PPE , RULL(0x10E020440), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_SRTCH1_SCOM , RULL(0x15012424), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_VCCR , RULL(0x1001242C), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 1001202C, @@ -3456,37 +3762,43 @@ REG64( EQ_5_CME_SCOM_VCCR , RULL(0x1501242C SH_ACS_SCOM_RW ); //DUPS: 1501202C, REG64( EX_CME_SCOM_VCCR_PPE , RULL(0x109010680), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_VCCR_SCOM , RULL(0x1001242C), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_VCCR_SCOM , RULL(0x1001202C), SH_UNT_EX , SH_ACS_SCOM_RW ); REG64( EX_0_CME_SCOM_VCCR_PPE , RULL(0x109010680), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_VCCR_SCOM , RULL(0x1001242C), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_VCCR_SCOM , RULL(0x1001202C), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); REG64( EX_1_CME_SCOM_VCCR_PPE , RULL(0x109020680), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_VCCR_SCOM , RULL(0x1001242C), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); REG64( EX_2_CME_SCOM_VCCR_PPE , RULL(0x10A010680), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_VCCR_SCOM , RULL(0x1101242C), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_VCCR_SCOM , RULL(0x1101202C), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); REG64( EX_3_CME_SCOM_VCCR_PPE , RULL(0x10A020680), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_VCCR_SCOM , RULL(0x1101242C), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); REG64( EX_4_CME_SCOM_VCCR_PPE , RULL(0x10B010680), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_VCCR_SCOM , RULL(0x1201242C), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_VCCR_SCOM , RULL(0x1201202C), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); REG64( EX_5_CME_SCOM_VCCR_PPE , RULL(0x10B020680), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_VCCR_SCOM , RULL(0x1201242C), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); REG64( EX_6_CME_SCOM_VCCR_PPE , RULL(0x10C010680), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_VCCR_SCOM , RULL(0x1301242C), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_VCCR_SCOM , RULL(0x1301202C), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); REG64( EX_7_CME_SCOM_VCCR_PPE , RULL(0x10C020680), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_VCCR_SCOM , RULL(0x1301242C), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); REG64( EX_8_CME_SCOM_VCCR_PPE , RULL(0x10D010680), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_VCCR_SCOM , RULL(0x1401242C), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_VCCR_SCOM , RULL(0x1401202C), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); REG64( EX_9_CME_SCOM_VCCR_PPE , RULL(0x10D020680), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_VCCR_SCOM , RULL(0x1401242C), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); REG64( EX_10_CME_SCOM_VCCR_PPE , RULL(0x10E010680), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_VCCR_SCOM , RULL(0x1501242C), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_VCCR_SCOM , RULL(0x1501202C), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); REG64( EX_11_CME_SCOM_VCCR_PPE , RULL(0x10E020680), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_VCCR_SCOM , RULL(0x1501242C), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_VCTR , RULL(0x10012439), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 10012039, @@ -3502,13 +3814,19 @@ REG64( EQ_4_CME_SCOM_VCTR , RULL(0x14012439 SH_ACS_SCOM_RW ); //DUPS: 14012039, REG64( EQ_5_CME_SCOM_VCTR , RULL(0x15012439), SH_UNT_EQ_5 , SH_ACS_SCOM_RW ); //DUPS: 15012039, -REG64( EX_CME_SCOM_VCTR , RULL(0x10012439), SH_UNT_EX , SH_ACS_SCOM_RW ); -REG64( EX_0_CME_SCOM_VCTR , RULL(0x10012439), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); -REG64( EX_2_CME_SCOM_VCTR , RULL(0x11012439), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); -REG64( EX_4_CME_SCOM_VCTR , RULL(0x12012439), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); -REG64( EX_6_CME_SCOM_VCTR , RULL(0x13012439), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); -REG64( EX_8_CME_SCOM_VCTR , RULL(0x14012439), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); -REG64( EX_10_CME_SCOM_VCTR , RULL(0x15012439), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_CME_SCOM_VCTR , RULL(0x10012039), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_0_CME_SCOM_VCTR , RULL(0x10012039), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_1_CME_SCOM_VCTR , RULL(0x10012439), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); +REG64( EX_2_CME_SCOM_VCTR , RULL(0x11012039), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_3_CME_SCOM_VCTR , RULL(0x11012439), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); +REG64( EX_4_CME_SCOM_VCTR , RULL(0x12012039), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_5_CME_SCOM_VCTR , RULL(0x12012439), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); +REG64( EX_6_CME_SCOM_VCTR , RULL(0x13012039), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_7_CME_SCOM_VCTR , RULL(0x13012439), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); +REG64( EX_8_CME_SCOM_VCTR , RULL(0x14012039), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_9_CME_SCOM_VCTR , RULL(0x14012439), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); +REG64( EX_10_CME_SCOM_VCTR , RULL(0x15012039), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_11_CME_SCOM_VCTR , RULL(0x15012439), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CME_SCOM_VDCR , RULL(0x10012435), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 10012035, @@ -3526,37 +3844,43 @@ REG64( EQ_5_CME_SCOM_VDCR , RULL(0x15012435 SH_ACS_SCOM_RO ); //DUPS: 15012035, REG64( EX_CME_SCOM_VDCR_PPE , RULL(0x109010600), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_VDCR_SCOM , RULL(0x10012435), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_SCOM_VDCR_SCOM , RULL(0x10012035), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_SCOM_VDCR_PPE , RULL(0x109010600), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_VDCR_SCOM , RULL(0x10012435), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_SCOM_VDCR_SCOM , RULL(0x10012035), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_SCOM_VDCR_PPE , RULL(0x109020600), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_VDCR_SCOM , RULL(0x10012435), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_SCOM_VDCR_PPE , RULL(0x10A010600), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_VDCR_SCOM , RULL(0x11012435), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_SCOM_VDCR_SCOM , RULL(0x11012035), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_SCOM_VDCR_PPE , RULL(0x10A020600), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_VDCR_SCOM , RULL(0x11012435), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_SCOM_VDCR_PPE , RULL(0x10B010600), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_VDCR_SCOM , RULL(0x12012435), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_SCOM_VDCR_SCOM , RULL(0x12012035), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_SCOM_VDCR_PPE , RULL(0x10B020600), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_VDCR_SCOM , RULL(0x12012435), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_SCOM_VDCR_PPE , RULL(0x10C010600), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_VDCR_SCOM , RULL(0x13012435), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_SCOM_VDCR_SCOM , RULL(0x13012035), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_SCOM_VDCR_PPE , RULL(0x10C020600), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_VDCR_SCOM , RULL(0x13012435), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_SCOM_VDCR_PPE , RULL(0x10D010600), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_VDCR_SCOM , RULL(0x14012435), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_SCOM_VDCR_SCOM , RULL(0x14012035), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_SCOM_VDCR_PPE , RULL(0x10D020600), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_VDCR_SCOM , RULL(0x14012435), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_SCOM_VDCR_PPE , RULL(0x10E010600), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_VDCR_SCOM , RULL(0x15012435), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_SCOM_VDCR_SCOM , RULL(0x15012035), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_SCOM_VDCR_PPE , RULL(0x10E020600), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_VDCR_SCOM , RULL(0x15012435), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_SCOM_VDSR , RULL(0x10012437), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 10012037, @@ -3574,37 +3898,43 @@ REG64( EQ_5_CME_SCOM_VDSR , RULL(0x15012437 SH_ACS_SCOM_RO ); //DUPS: 15012037, REG64( EX_CME_SCOM_VDSR_PPE , RULL(0x109010640), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_VDSR_SCOM , RULL(0x10012437), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_SCOM_VDSR_SCOM , RULL(0x10012037), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_SCOM_VDSR_PPE , RULL(0x109010640), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_VDSR_SCOM , RULL(0x10012437), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_SCOM_VDSR_SCOM , RULL(0x10012037), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_SCOM_VDSR_PPE , RULL(0x109020640), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_VDSR_SCOM , RULL(0x10012437), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_SCOM_VDSR_PPE , RULL(0x10A010640), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_VDSR_SCOM , RULL(0x11012437), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_SCOM_VDSR_SCOM , RULL(0x11012037), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_SCOM_VDSR_PPE , RULL(0x10A020640), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_VDSR_SCOM , RULL(0x11012437), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_SCOM_VDSR_PPE , RULL(0x10B010640), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_VDSR_SCOM , RULL(0x12012437), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_SCOM_VDSR_SCOM , RULL(0x12012037), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_SCOM_VDSR_PPE , RULL(0x10B020640), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_VDSR_SCOM , RULL(0x12012437), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_SCOM_VDSR_PPE , RULL(0x10C010640), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_VDSR_SCOM , RULL(0x13012437), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_SCOM_VDSR_SCOM , RULL(0x13012037), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_SCOM_VDSR_PPE , RULL(0x10C020640), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_VDSR_SCOM , RULL(0x13012437), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_SCOM_VDSR_PPE , RULL(0x10D010640), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_VDSR_SCOM , RULL(0x14012437), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_SCOM_VDSR_SCOM , RULL(0x14012037), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_SCOM_VDSR_PPE , RULL(0x10D020640), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_VDSR_SCOM , RULL(0x14012437), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_SCOM_VDSR_PPE , RULL(0x10E010640), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_VDSR_SCOM , RULL(0x15012437), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_SCOM_VDSR_SCOM , RULL(0x15012037), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_SCOM_VDSR_PPE , RULL(0x10E020640), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_VDSR_SCOM , RULL(0x15012437), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_SCOM_VECR , RULL(0x10012438), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 10012038, @@ -3622,37 +3952,43 @@ REG64( EQ_5_CME_SCOM_VECR , RULL(0x15012438 SH_ACS_SCOM_RO ); //DUPS: 15012038, REG64( EX_CME_SCOM_VECR_PPE , RULL(0x109010660), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_VECR_SCOM , RULL(0x10012438), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_SCOM_VECR_SCOM , RULL(0x10012038), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_SCOM_VECR_PPE , RULL(0x109010660), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_VECR_SCOM , RULL(0x10012438), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_SCOM_VECR_SCOM , RULL(0x10012038), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_SCOM_VECR_PPE , RULL(0x109020660), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_VECR_SCOM , RULL(0x10012438), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_SCOM_VECR_PPE , RULL(0x10A010660), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_VECR_SCOM , RULL(0x11012438), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_SCOM_VECR_SCOM , RULL(0x11012038), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_SCOM_VECR_PPE , RULL(0x10A020660), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_VECR_SCOM , RULL(0x11012438), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_SCOM_VECR_PPE , RULL(0x10B010660), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_VECR_SCOM , RULL(0x12012438), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_SCOM_VECR_SCOM , RULL(0x12012038), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_SCOM_VECR_PPE , RULL(0x10B020660), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_VECR_SCOM , RULL(0x12012438), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_SCOM_VECR_PPE , RULL(0x10C010660), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_VECR_SCOM , RULL(0x13012438), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_SCOM_VECR_SCOM , RULL(0x13012038), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_SCOM_VECR_PPE , RULL(0x10C020660), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_VECR_SCOM , RULL(0x13012438), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_SCOM_VECR_PPE , RULL(0x10D010660), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_VECR_SCOM , RULL(0x14012438), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_SCOM_VECR_SCOM , RULL(0x14012038), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_SCOM_VECR_PPE , RULL(0x10D020660), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_VECR_SCOM , RULL(0x14012438), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_SCOM_VECR_PPE , RULL(0x10E010660), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_VECR_SCOM , RULL(0x15012438), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_SCOM_VECR_SCOM , RULL(0x15012038), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_SCOM_VECR_PPE , RULL(0x10E020660), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_VECR_SCOM , RULL(0x15012438), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_SCOM_VNCR , RULL(0x10012436), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 10012036, @@ -3670,37 +4006,43 @@ REG64( EQ_5_CME_SCOM_VNCR , RULL(0x15012436 SH_ACS_SCOM_RO ); //DUPS: 15012036, REG64( EX_CME_SCOM_VNCR_PPE , RULL(0x109010620), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_VNCR_SCOM , RULL(0x10012436), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_SCOM_VNCR_SCOM , RULL(0x10012036), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_SCOM_VNCR_PPE , RULL(0x109010620), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_VNCR_SCOM , RULL(0x10012436), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_SCOM_VNCR_SCOM , RULL(0x10012036), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_SCOM_VNCR_PPE , RULL(0x109020620), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_VNCR_SCOM , RULL(0x10012436), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_SCOM_VNCR_PPE , RULL(0x10A010620), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_VNCR_SCOM , RULL(0x11012436), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_SCOM_VNCR_SCOM , RULL(0x11012036), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_SCOM_VNCR_PPE , RULL(0x10A020620), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_VNCR_SCOM , RULL(0x11012436), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_SCOM_VNCR_PPE , RULL(0x10B010620), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_VNCR_SCOM , RULL(0x12012436), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_SCOM_VNCR_SCOM , RULL(0x12012036), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_SCOM_VNCR_PPE , RULL(0x10B020620), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_VNCR_SCOM , RULL(0x12012436), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_SCOM_VNCR_PPE , RULL(0x10C010620), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_VNCR_SCOM , RULL(0x13012436), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_SCOM_VNCR_SCOM , RULL(0x13012036), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_SCOM_VNCR_PPE , RULL(0x10C020620), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_VNCR_SCOM , RULL(0x13012436), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_SCOM_VNCR_PPE , RULL(0x10D010620), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_VNCR_SCOM , RULL(0x14012436), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_SCOM_VNCR_SCOM , RULL(0x14012036), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_SCOM_VNCR_PPE , RULL(0x10D020620), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_VNCR_SCOM , RULL(0x14012436), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_SCOM_VNCR_PPE , RULL(0x10E010620), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_VNCR_SCOM , RULL(0x15012436), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_SCOM_VNCR_SCOM , RULL(0x15012036), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_SCOM_VNCR_PPE , RULL(0x10E020620), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_VNCR_SCOM , RULL(0x15012436), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_SCOM_XIPCBMD0 , RULL(0x1001241C), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 1001201C, @@ -3718,37 +4060,43 @@ REG64( EQ_5_CME_SCOM_XIPCBMD0 , RULL(0x1501241C SH_ACS_SCOM_RO ); //DUPS: 1501201C, REG64( EX_CME_SCOM_XIPCBMD0_PPE , RULL(0x109010580), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1001241C), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1001201C), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_SCOM_XIPCBMD0_PPE , RULL(0x109010580), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1001241C), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1001201C), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_SCOM_XIPCBMD0_PPE , RULL(0x109020580), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1001241C), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_SCOM_XIPCBMD0_PPE , RULL(0x10A010580), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1101241C), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1101201C), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_SCOM_XIPCBMD0_PPE , RULL(0x10A020580), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1101241C), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_SCOM_XIPCBMD0_PPE , RULL(0x10B010580), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1201241C), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1201201C), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_SCOM_XIPCBMD0_PPE , RULL(0x10B020580), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1201241C), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_SCOM_XIPCBMD0_PPE , RULL(0x10C010580), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1301241C), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1301201C), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_SCOM_XIPCBMD0_PPE , RULL(0x10C020580), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1301241C), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_SCOM_XIPCBMD0_PPE , RULL(0x10D010580), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1401241C), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1401201C), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_SCOM_XIPCBMD0_PPE , RULL(0x10D020580), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1401241C), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_SCOM_XIPCBMD0_PPE , RULL(0x10E010580), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1501241C), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1501201C), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_SCOM_XIPCBMD0_PPE , RULL(0x10E020580), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_XIPCBMD0_SCOM , RULL(0x1501241C), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_SCOM_XIPCBMD1 , RULL(0x1001241D), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 1001201D, @@ -3766,37 +4114,43 @@ REG64( EQ_5_CME_SCOM_XIPCBMD1 , RULL(0x1501241D SH_ACS_SCOM_RO ); //DUPS: 1501201D, REG64( EX_CME_SCOM_XIPCBMD1_PPE , RULL(0x1090105A0), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1001241D), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1001201D), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_SCOM_XIPCBMD1_PPE , RULL(0x1090105A0), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1001241D), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1001201D), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_SCOM_XIPCBMD1_PPE , RULL(0x1090205A0), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1001241D), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_SCOM_XIPCBMD1_PPE , RULL(0x10A0105A0), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1101241D), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1101201D), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_SCOM_XIPCBMD1_PPE , RULL(0x10A0205A0), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1101241D), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_SCOM_XIPCBMD1_PPE , RULL(0x10B0105A0), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1201241D), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1201201D), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_SCOM_XIPCBMD1_PPE , RULL(0x10B0205A0), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1201241D), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_SCOM_XIPCBMD1_PPE , RULL(0x10C0105A0), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1301241D), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1301201D), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_SCOM_XIPCBMD1_PPE , RULL(0x10C0205A0), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1301241D), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_SCOM_XIPCBMD1_PPE , RULL(0x10D0105A0), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1401241D), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1401201D), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_SCOM_XIPCBMD1_PPE , RULL(0x10D0205A0), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1401241D), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_SCOM_XIPCBMD1_PPE , RULL(0x10E0105A0), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1501241D), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1501201D), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_SCOM_XIPCBMD1_PPE , RULL(0x10E0205A0), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_XIPCBMD1_SCOM , RULL(0x1501241D), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_SCOM_XIPCBMI0 , RULL(0x1001241E), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 1001201E, @@ -3814,37 +4168,43 @@ REG64( EQ_5_CME_SCOM_XIPCBMI0 , RULL(0x1501241E SH_ACS_SCOM_RO ); //DUPS: 1501201E, REG64( EX_CME_SCOM_XIPCBMI0_PPE , RULL(0x1090105C0), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1001241E), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1001201E), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_SCOM_XIPCBMI0_PPE , RULL(0x1090105C0), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1001241E), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1001201E), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_SCOM_XIPCBMI0_PPE , RULL(0x1090205C0), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1001241E), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_SCOM_XIPCBMI0_PPE , RULL(0x10A0105C0), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1101241E), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1101201E), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_SCOM_XIPCBMI0_PPE , RULL(0x10A0205C0), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1101241E), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_SCOM_XIPCBMI0_PPE , RULL(0x10B0105C0), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1201241E), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1201201E), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_SCOM_XIPCBMI0_PPE , RULL(0x10B0205C0), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1201241E), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_SCOM_XIPCBMI0_PPE , RULL(0x10C0105C0), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1301241E), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1301201E), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_SCOM_XIPCBMI0_PPE , RULL(0x10C0205C0), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1301241E), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_SCOM_XIPCBMI0_PPE , RULL(0x10D0105C0), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1401241E), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1401201E), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_SCOM_XIPCBMI0_PPE , RULL(0x10D0205C0), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1401241E), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_SCOM_XIPCBMI0_PPE , RULL(0x10E0105C0), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1501241E), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1501201E), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_SCOM_XIPCBMI0_PPE , RULL(0x10E0205C0), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_XIPCBMI0_SCOM , RULL(0x1501241E), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_SCOM_XIPCBMI1 , RULL(0x1001241F), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 1001201F, @@ -3862,37 +4222,43 @@ REG64( EQ_5_CME_SCOM_XIPCBMI1 , RULL(0x1501241F SH_ACS_SCOM_RO ); //DUPS: 1501201F, REG64( EX_CME_SCOM_XIPCBMI1_PPE , RULL(0x1090105E0), SH_UNT_EX , SH_ACS_PPE ); -REG64( EX_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1001241F), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1001201F), SH_UNT_EX , SH_ACS_SCOM_RO ); REG64( EX_0_CME_SCOM_XIPCBMI1_PPE , RULL(0x1090105E0), SH_UNT_EX_0 , SH_ACS_PPE ); -REG64( EX_0_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1001241F), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1001201F), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); REG64( EX_1_CME_SCOM_XIPCBMI1_PPE , RULL(0x1090205E0), SH_UNT_EX_1 , SH_ACS_PPE ); +REG64( EX_1_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1001241F), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); REG64( EX_2_CME_SCOM_XIPCBMI1_PPE , RULL(0x10A0105E0), SH_UNT_EX_2 , SH_ACS_PPE ); -REG64( EX_2_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1101241F), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1101201F), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); REG64( EX_3_CME_SCOM_XIPCBMI1_PPE , RULL(0x10A0205E0), SH_UNT_EX_3 , SH_ACS_PPE ); +REG64( EX_3_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1101241F), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); REG64( EX_4_CME_SCOM_XIPCBMI1_PPE , RULL(0x10B0105E0), SH_UNT_EX_4 , SH_ACS_PPE ); -REG64( EX_4_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1201241F), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1201201F), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); REG64( EX_5_CME_SCOM_XIPCBMI1_PPE , RULL(0x10B0205E0), SH_UNT_EX_5 , SH_ACS_PPE ); +REG64( EX_5_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1201241F), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); REG64( EX_6_CME_SCOM_XIPCBMI1_PPE , RULL(0x10C0105E0), SH_UNT_EX_6 , SH_ACS_PPE ); -REG64( EX_6_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1301241F), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1301201F), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); REG64( EX_7_CME_SCOM_XIPCBMI1_PPE , RULL(0x10C0205E0), SH_UNT_EX_7 , SH_ACS_PPE ); +REG64( EX_7_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1301241F), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); REG64( EX_8_CME_SCOM_XIPCBMI1_PPE , RULL(0x10D0105E0), SH_UNT_EX_8 , SH_ACS_PPE ); -REG64( EX_8_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1401241F), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1401201F), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); REG64( EX_9_CME_SCOM_XIPCBMI1_PPE , RULL(0x10D0205E0), SH_UNT_EX_9 , SH_ACS_PPE ); +REG64( EX_9_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1401241F), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); REG64( EX_10_CME_SCOM_XIPCBMI1_PPE , RULL(0x10E0105E0), SH_UNT_EX_10 , SH_ACS_PPE ); -REG64( EX_10_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1501241F), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1501201F), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EX_11_CME_SCOM_XIPCBMI1_PPE , RULL(0x10E0205E0), SH_UNT_EX_11 , SH_ACS_PPE ); +REG64( EX_11_CME_SCOM_XIPCBMI1_SCOM , RULL(0x1501241F), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_SCOM_XIPCBQ0 , RULL(0x1001241A), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 1001201A, @@ -3908,13 +4274,19 @@ REG64( EQ_4_CME_SCOM_XIPCBQ0 , RULL(0x1401241A SH_ACS_SCOM_RO ); //DUPS: 1401201A, REG64( EQ_5_CME_SCOM_XIPCBQ0 , RULL(0x1501241A), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); //DUPS: 1501201A, -REG64( EX_CME_SCOM_XIPCBQ0 , RULL(0x1001241A), SH_UNT_EX , SH_ACS_SCOM_RO ); -REG64( EX_0_CME_SCOM_XIPCBQ0 , RULL(0x1001241A), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); -REG64( EX_2_CME_SCOM_XIPCBQ0 , RULL(0x1101241A), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); -REG64( EX_4_CME_SCOM_XIPCBQ0 , RULL(0x1201241A), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); -REG64( EX_6_CME_SCOM_XIPCBQ0 , RULL(0x1301241A), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); -REG64( EX_8_CME_SCOM_XIPCBQ0 , RULL(0x1401241A), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); -REG64( EX_10_CME_SCOM_XIPCBQ0 , RULL(0x1501241A), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_CME_SCOM_XIPCBQ0 , RULL(0x1001201A), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_SCOM_XIPCBQ0 , RULL(0x1001201A), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_1_CME_SCOM_XIPCBQ0 , RULL(0x1001241A), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_SCOM_XIPCBQ0 , RULL(0x1101201A), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_3_CME_SCOM_XIPCBQ0 , RULL(0x1101241A), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_SCOM_XIPCBQ0 , RULL(0x1201201A), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_5_CME_SCOM_XIPCBQ0 , RULL(0x1201241A), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_SCOM_XIPCBQ0 , RULL(0x1301201A), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_7_CME_SCOM_XIPCBQ0 , RULL(0x1301241A), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_SCOM_XIPCBQ0 , RULL(0x1401201A), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_9_CME_SCOM_XIPCBQ0 , RULL(0x1401241A), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_SCOM_XIPCBQ0 , RULL(0x1501201A), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_11_CME_SCOM_XIPCBQ0 , RULL(0x1501241A), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_CME_SCOM_XIPCBQ1 , RULL(0x1001241B), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 1001201B, @@ -3930,13 +4302,19 @@ REG64( EQ_4_CME_SCOM_XIPCBQ1 , RULL(0x1401241B SH_ACS_SCOM_RO ); //DUPS: 1401201B, REG64( EQ_5_CME_SCOM_XIPCBQ1 , RULL(0x1501241B), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); //DUPS: 1501201B, -REG64( EX_CME_SCOM_XIPCBQ1 , RULL(0x1001241B), SH_UNT_EX , SH_ACS_SCOM_RO ); -REG64( EX_0_CME_SCOM_XIPCBQ1 , RULL(0x1001241B), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); -REG64( EX_2_CME_SCOM_XIPCBQ1 , RULL(0x1101241B), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); -REG64( EX_4_CME_SCOM_XIPCBQ1 , RULL(0x1201241B), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); -REG64( EX_6_CME_SCOM_XIPCBQ1 , RULL(0x1301241B), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); -REG64( EX_8_CME_SCOM_XIPCBQ1 , RULL(0x1401241B), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); -REG64( EX_10_CME_SCOM_XIPCBQ1 , RULL(0x1501241B), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_CME_SCOM_XIPCBQ1 , RULL(0x1001201B), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_0_CME_SCOM_XIPCBQ1 , RULL(0x1001201B), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_1_CME_SCOM_XIPCBQ1 , RULL(0x1001241B), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); +REG64( EX_2_CME_SCOM_XIPCBQ1 , RULL(0x1101201B), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_3_CME_SCOM_XIPCBQ1 , RULL(0x1101241B), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); +REG64( EX_4_CME_SCOM_XIPCBQ1 , RULL(0x1201201B), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_5_CME_SCOM_XIPCBQ1 , RULL(0x1201241B), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); +REG64( EX_6_CME_SCOM_XIPCBQ1 , RULL(0x1301201B), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_7_CME_SCOM_XIPCBQ1 , RULL(0x1301241B), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); +REG64( EX_8_CME_SCOM_XIPCBQ1 , RULL(0x1401201B), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_9_CME_SCOM_XIPCBQ1 , RULL(0x1401241B), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); +REG64( EX_10_CME_SCOM_XIPCBQ1 , RULL(0x1501201B), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_11_CME_SCOM_XIPCBQ1 , RULL(0x1501241B), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( C_CONTROL_REG , RULL(0x20050012), SH_UNT_C , SH_ACS_SCOM ); REG64( C_0_CONTROL_REG , RULL(0x20050012), SH_UNT_C_0 , SH_ACS_SCOM ); @@ -7991,13 +8369,19 @@ REG64( EQ_4_CSAR , RULL(0x1401240D SH_ACS_SCOM_RW ); //DUPS: 1401200D, REG64( EQ_5_CSAR , RULL(0x1501240D), SH_UNT_EQ_5 , SH_ACS_SCOM_RW ); //DUPS: 1501200D, -REG64( EX_CSAR , RULL(0x1001240D), SH_UNT_EX , SH_ACS_SCOM_RW ); -REG64( EX_0_CSAR , RULL(0x1001240D), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); -REG64( EX_2_CSAR , RULL(0x1101240D), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); -REG64( EX_4_CSAR , RULL(0x1201240D), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); -REG64( EX_6_CSAR , RULL(0x1301240D), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); -REG64( EX_8_CSAR , RULL(0x1401240D), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); -REG64( EX_10_CSAR , RULL(0x1501240D), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_CSAR , RULL(0x1001200D), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_0_CSAR , RULL(0x1001200D), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_1_CSAR , RULL(0x1001240D), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); +REG64( EX_2_CSAR , RULL(0x1101200D), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_3_CSAR , RULL(0x1101240D), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); +REG64( EX_4_CSAR , RULL(0x1201200D), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_5_CSAR , RULL(0x1201240D), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); +REG64( EX_6_CSAR , RULL(0x1301200D), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_7_CSAR , RULL(0x1301240D), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); +REG64( EX_8_CSAR , RULL(0x1401200D), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_9_CSAR , RULL(0x1401240D), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); +REG64( EX_10_CSAR , RULL(0x1501200D), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_11_CSAR , RULL(0x1501240D), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( EQ_CSCR , RULL(0x1001240A), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 1001200A, @@ -8041,34 +8425,58 @@ REG64( EQ_5_CSCR_CLEAR , RULL(0x1501240B SH_ACS_SCOM1_CLEAR ); //DUPS: 1501200B, REG64( EQ_5_CSCR_OR , RULL(0x1501240C), SH_UNT_EQ_5 , SH_ACS_SCOM2_OR ); //DUPS: 1501200C, -REG64( EX_CSCR , RULL(0x1001240A), SH_UNT_EX , SH_ACS_SCOM_RW ); -REG64( EX_CSCR_CLEAR , RULL(0x1001240B), SH_UNT_EX , +REG64( EX_CSCR , RULL(0x1001200A), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_CSCR_CLEAR , RULL(0x1001200B), SH_UNT_EX , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_CSCR_OR , RULL(0x1001200C), SH_UNT_EX , SH_ACS_SCOM2_OR ); +REG64( EX_0_CSCR , RULL(0x1001200A), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_0_CSCR_CLEAR , RULL(0x1001200B), SH_UNT_EX_0 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_0_CSCR_OR , RULL(0x1001200C), SH_UNT_EX_0 , SH_ACS_SCOM2_OR ); +REG64( EX_1_CSCR , RULL(0x1001240A), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); +REG64( EX_1_CSCR_CLEAR , RULL(0x1001240B), SH_UNT_EX_1 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_1_CSCR_OR , RULL(0x1001240C), SH_UNT_EX_1 , SH_ACS_SCOM2_OR ); +REG64( EX_2_CSCR , RULL(0x1101200A), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_2_CSCR_CLEAR , RULL(0x1101200B), SH_UNT_EX_2 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_2_CSCR_OR , RULL(0x1101200C), SH_UNT_EX_2 , SH_ACS_SCOM2_OR ); +REG64( EX_3_CSCR , RULL(0x1101240A), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); +REG64( EX_3_CSCR_CLEAR , RULL(0x1101240B), SH_UNT_EX_3 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_3_CSCR_OR , RULL(0x1101240C), SH_UNT_EX_3 , SH_ACS_SCOM2_OR ); +REG64( EX_4_CSCR , RULL(0x1201200A), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_4_CSCR_CLEAR , RULL(0x1201200B), SH_UNT_EX_4 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_CSCR_OR , RULL(0x1001240C), SH_UNT_EX , SH_ACS_SCOM2_OR ); -REG64( EX_0_CSCR , RULL(0x1001240A), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); -REG64( EX_0_CSCR_CLEAR , RULL(0x1001240B), SH_UNT_EX_0 , +REG64( EX_4_CSCR_OR , RULL(0x1201200C), SH_UNT_EX_4 , SH_ACS_SCOM2_OR ); +REG64( EX_5_CSCR , RULL(0x1201240A), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); +REG64( EX_5_CSCR_CLEAR , RULL(0x1201240B), SH_UNT_EX_5 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_0_CSCR_OR , RULL(0x1001240C), SH_UNT_EX_0 , SH_ACS_SCOM2_OR ); -REG64( EX_2_CSCR , RULL(0x1101240A), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); -REG64( EX_2_CSCR_CLEAR , RULL(0x1101240B), SH_UNT_EX_2 , +REG64( EX_5_CSCR_OR , RULL(0x1201240C), SH_UNT_EX_5 , SH_ACS_SCOM2_OR ); +REG64( EX_6_CSCR , RULL(0x1301200A), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_6_CSCR_CLEAR , RULL(0x1301200B), SH_UNT_EX_6 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_2_CSCR_OR , RULL(0x1101240C), SH_UNT_EX_2 , SH_ACS_SCOM2_OR ); -REG64( EX_4_CSCR , RULL(0x1201240A), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); -REG64( EX_4_CSCR_CLEAR , RULL(0x1201240B), SH_UNT_EX_4 , +REG64( EX_6_CSCR_OR , RULL(0x1301200C), SH_UNT_EX_6 , SH_ACS_SCOM2_OR ); +REG64( EX_7_CSCR , RULL(0x1301240A), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); +REG64( EX_7_CSCR_CLEAR , RULL(0x1301240B), SH_UNT_EX_7 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_4_CSCR_OR , RULL(0x1201240C), SH_UNT_EX_4 , SH_ACS_SCOM2_OR ); -REG64( EX_6_CSCR , RULL(0x1301240A), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); -REG64( EX_6_CSCR_CLEAR , RULL(0x1301240B), SH_UNT_EX_6 , +REG64( EX_7_CSCR_OR , RULL(0x1301240C), SH_UNT_EX_7 , SH_ACS_SCOM2_OR ); +REG64( EX_8_CSCR , RULL(0x1401200A), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_8_CSCR_CLEAR , RULL(0x1401200B), SH_UNT_EX_8 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_6_CSCR_OR , RULL(0x1301240C), SH_UNT_EX_6 , SH_ACS_SCOM2_OR ); -REG64( EX_8_CSCR , RULL(0x1401240A), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); -REG64( EX_8_CSCR_CLEAR , RULL(0x1401240B), SH_UNT_EX_8 , +REG64( EX_8_CSCR_OR , RULL(0x1401200C), SH_UNT_EX_8 , SH_ACS_SCOM2_OR ); +REG64( EX_9_CSCR , RULL(0x1401240A), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); +REG64( EX_9_CSCR_CLEAR , RULL(0x1401240B), SH_UNT_EX_9 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_8_CSCR_OR , RULL(0x1401240C), SH_UNT_EX_8 , SH_ACS_SCOM2_OR ); -REG64( EX_10_CSCR , RULL(0x1501240A), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); -REG64( EX_10_CSCR_CLEAR , RULL(0x1501240B), SH_UNT_EX_10 , +REG64( EX_9_CSCR_OR , RULL(0x1401240C), SH_UNT_EX_9 , SH_ACS_SCOM2_OR ); +REG64( EX_10_CSCR , RULL(0x1501200A), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_10_CSCR_CLEAR , RULL(0x1501200B), SH_UNT_EX_10 , SH_ACS_SCOM1_CLEAR ); -REG64( EX_10_CSCR_OR , RULL(0x1501240C), SH_UNT_EX_10 , SH_ACS_SCOM2_OR ); +REG64( EX_10_CSCR_OR , RULL(0x1501200C), SH_UNT_EX_10 , SH_ACS_SCOM2_OR ); +REG64( EX_11_CSCR , RULL(0x1501240A), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); +REG64( EX_11_CSCR_CLEAR , RULL(0x1501240B), SH_UNT_EX_11 , + SH_ACS_SCOM1_CLEAR ); +REG64( EX_11_CSCR_OR , RULL(0x1501240C), SH_UNT_EX_11 , SH_ACS_SCOM2_OR ); REG64( EQ_CSDR , RULL(0x1001240E), SH_UNT_EQ , SH_ACS_SCOM_RW ); //DUPS: 1001200E, @@ -8084,13 +8492,19 @@ REG64( EQ_4_CSDR , RULL(0x1401240E SH_ACS_SCOM_RW ); //DUPS: 1401200E, REG64( EQ_5_CSDR , RULL(0x1501240E), SH_UNT_EQ_5 , SH_ACS_SCOM_RW ); //DUPS: 1501200E, -REG64( EX_CSDR , RULL(0x1001240E), SH_UNT_EX , SH_ACS_SCOM_RW ); -REG64( EX_0_CSDR , RULL(0x1001240E), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); -REG64( EX_2_CSDR , RULL(0x1101240E), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); -REG64( EX_4_CSDR , RULL(0x1201240E), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); -REG64( EX_6_CSDR , RULL(0x1301240E), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); -REG64( EX_8_CSDR , RULL(0x1401240E), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); -REG64( EX_10_CSDR , RULL(0x1501240E), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_CSDR , RULL(0x1001200E), SH_UNT_EX , SH_ACS_SCOM_RW ); +REG64( EX_0_CSDR , RULL(0x1001200E), SH_UNT_EX_0 , SH_ACS_SCOM_RW ); +REG64( EX_1_CSDR , RULL(0x1001240E), SH_UNT_EX_1 , SH_ACS_SCOM_RW ); +REG64( EX_2_CSDR , RULL(0x1101200E), SH_UNT_EX_2 , SH_ACS_SCOM_RW ); +REG64( EX_3_CSDR , RULL(0x1101240E), SH_UNT_EX_3 , SH_ACS_SCOM_RW ); +REG64( EX_4_CSDR , RULL(0x1201200E), SH_UNT_EX_4 , SH_ACS_SCOM_RW ); +REG64( EX_5_CSDR , RULL(0x1201240E), SH_UNT_EX_5 , SH_ACS_SCOM_RW ); +REG64( EX_6_CSDR , RULL(0x1301200E), SH_UNT_EX_6 , SH_ACS_SCOM_RW ); +REG64( EX_7_CSDR , RULL(0x1301240E), SH_UNT_EX_7 , SH_ACS_SCOM_RW ); +REG64( EX_8_CSDR , RULL(0x1401200E), SH_UNT_EX_8 , SH_ACS_SCOM_RW ); +REG64( EX_9_CSDR , RULL(0x1401240E), SH_UNT_EX_9 , SH_ACS_SCOM_RW ); +REG64( EX_10_CSDR , RULL(0x1501200E), SH_UNT_EX_10 , SH_ACS_SCOM_RW ); +REG64( EX_11_CSDR , RULL(0x1501240E), SH_UNT_EX_11 , SH_ACS_SCOM_RW ); REG64( C_CTRL , RULL(0x20010A85), SH_UNT_C , SH_ACS_SCOM_NC ); REG64( C_0_CTRL , RULL(0x20010A85), SH_UNT_C_0 , SH_ACS_SCOM_NC ); @@ -11286,33 +11700,43 @@ REG64( EQ_4_HTM_CTRL , RULL(0x14012605 SH_ACS_SCOM_RW ); //DUPS: 14012705, 14012205, 14012305, REG64( EQ_5_HTM_CTRL , RULL(0x15012605), SH_UNT_EQ_5 , SH_ACS_SCOM_RW ); //DUPS: 15012705, 15012205, 15012305, -REG64( EX_0_CHTMLBS0_HTM_CTRL , RULL(0x10012605), SH_UNT_EX_0_CHTMLBS0, - SH_ACS_SCOM_RW ); -REG64( EX_0_CHTMLBS1_HTM_CTRL , RULL(0x10012705), SH_UNT_EX_0_CHTMLBS1, - SH_ACS_SCOM_RW ); -REG64( EX_10_CHTMLBS0_HTM_CTRL , RULL(0x15012605), SH_UNT_EX_10_CHTMLBS0, +REG64( EX_HTM_CTRL , RULL(0x10012205), SH_UNT_EX , + SH_ACS_SCOM_RW ); //DUPS: 10012305, +REG64( EX_0_HTM_CTRL , RULL(0x10012205), SH_UNT_EX_0 , + SH_ACS_SCOM_RW ); //DUPS: 10012305, +REG64( EX_2_HTM_CTRL , RULL(0x11012205), SH_UNT_EX_2 , + SH_ACS_SCOM_RW ); //DUPS: 11012305, +REG64( EX_4_HTM_CTRL , RULL(0x12012205), SH_UNT_EX_4 , + SH_ACS_SCOM_RW ); //DUPS: 12012305, +REG64( EX_6_HTM_CTRL , RULL(0x13012205), SH_UNT_EX_6 , + SH_ACS_SCOM_RW ); //DUPS: 13012305, +REG64( EX_8_HTM_CTRL , RULL(0x14012205), SH_UNT_EX_8 , + SH_ACS_SCOM_RW ); //DUPS: 14012305, +REG64( EX_10_HTM_CTRL , RULL(0x15012205), SH_UNT_EX_10 , + SH_ACS_SCOM_RW ); //DUPS: 15012305, +REG64( EX_11_CHTMLBS0_HTM_CTRL , RULL(0x15012605), SH_UNT_EX_11_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_10_CHTMLBS1_HTM_CTRL , RULL(0x15012705), SH_UNT_EX_10_CHTMLBS1, +REG64( EX_11_CHTMLBS1_HTM_CTRL , RULL(0x15012705), SH_UNT_EX_11_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_2_CHTMLBS0_HTM_CTRL , RULL(0x11012605), SH_UNT_EX_2_CHTMLBS0, +REG64( EX_1_CHTMLBS0_HTM_CTRL , RULL(0x10012605), SH_UNT_EX_1_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_2_CHTMLBS1_HTM_CTRL , RULL(0x11012705), SH_UNT_EX_2_CHTMLBS1, +REG64( EX_1_CHTMLBS1_HTM_CTRL , RULL(0x10012705), SH_UNT_EX_1_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_4_CHTMLBS0_HTM_CTRL , RULL(0x12012605), SH_UNT_EX_4_CHTMLBS0, +REG64( EX_3_CHTMLBS0_HTM_CTRL , RULL(0x11012605), SH_UNT_EX_3_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_4_CHTMLBS1_HTM_CTRL , RULL(0x12012705), SH_UNT_EX_4_CHTMLBS1, +REG64( EX_3_CHTMLBS1_HTM_CTRL , RULL(0x11012705), SH_UNT_EX_3_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_6_CHTMLBS0_HTM_CTRL , RULL(0x13012605), SH_UNT_EX_6_CHTMLBS0, +REG64( EX_5_CHTMLBS0_HTM_CTRL , RULL(0x12012605), SH_UNT_EX_5_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_6_CHTMLBS1_HTM_CTRL , RULL(0x13012705), SH_UNT_EX_6_CHTMLBS1, +REG64( EX_5_CHTMLBS1_HTM_CTRL , RULL(0x12012705), SH_UNT_EX_5_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_8_CHTMLBS0_HTM_CTRL , RULL(0x14012605), SH_UNT_EX_8_CHTMLBS0, +REG64( EX_7_CHTMLBS0_HTM_CTRL , RULL(0x13012605), SH_UNT_EX_7_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_8_CHTMLBS1_HTM_CTRL , RULL(0x14012705), SH_UNT_EX_8_CHTMLBS1, +REG64( EX_7_CHTMLBS1_HTM_CTRL , RULL(0x13012705), SH_UNT_EX_7_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_CHTMLBS0_HTM_CTRL , RULL(0x10012605), SH_UNT_EX_CHTMLBS0, +REG64( EX_9_CHTMLBS0_HTM_CTRL , RULL(0x14012605), SH_UNT_EX_9_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_CHTMLBS1_HTM_CTRL , RULL(0x10012705), SH_UNT_EX_CHTMLBS1, +REG64( EX_9_CHTMLBS1_HTM_CTRL , RULL(0x14012705), SH_UNT_EX_9_CHTMLBS1, SH_ACS_SCOM_RW ); REG64( EQ_HTM_IMA_PDBAR , RULL(0x1001260B), SH_UNT_EQ , @@ -11329,33 +11753,43 @@ REG64( EQ_4_HTM_IMA_PDBAR , RULL(0x1401260B SH_ACS_SCOM_RW ); //DUPS: 1401270B, 1401220B, 1401230B, REG64( EQ_5_HTM_IMA_PDBAR , RULL(0x1501260B), SH_UNT_EQ_5 , SH_ACS_SCOM_RW ); //DUPS: 1501270B, 1501220B, 1501230B, -REG64( EX_0_CHTMLBS0_HTM_IMA_PDBAR , RULL(0x1001260B), SH_UNT_EX_0_CHTMLBS0, - SH_ACS_SCOM_RW ); -REG64( EX_0_CHTMLBS1_HTM_IMA_PDBAR , RULL(0x1001270B), SH_UNT_EX_0_CHTMLBS1, - SH_ACS_SCOM_RW ); -REG64( EX_10_CHTMLBS0_HTM_IMA_PDBAR , RULL(0x1501260B), SH_UNT_EX_10_CHTMLBS0, +REG64( EX_HTM_IMA_PDBAR , RULL(0x1001220B), SH_UNT_EX , + SH_ACS_SCOM_RW ); //DUPS: 1001230B, +REG64( EX_0_HTM_IMA_PDBAR , RULL(0x1001220B), SH_UNT_EX_0 , + SH_ACS_SCOM_RW ); //DUPS: 1001230B, +REG64( EX_2_HTM_IMA_PDBAR , RULL(0x1101220B), SH_UNT_EX_2 , + SH_ACS_SCOM_RW ); //DUPS: 1101230B, +REG64( EX_4_HTM_IMA_PDBAR , RULL(0x1201220B), SH_UNT_EX_4 , + SH_ACS_SCOM_RW ); //DUPS: 1201230B, +REG64( EX_6_HTM_IMA_PDBAR , RULL(0x1301220B), SH_UNT_EX_6 , + SH_ACS_SCOM_RW ); //DUPS: 1301230B, +REG64( EX_8_HTM_IMA_PDBAR , RULL(0x1401220B), SH_UNT_EX_8 , + SH_ACS_SCOM_RW ); //DUPS: 1401230B, +REG64( EX_10_HTM_IMA_PDBAR , RULL(0x1501220B), SH_UNT_EX_10 , + SH_ACS_SCOM_RW ); //DUPS: 1501230B, +REG64( EX_11_CHTMLBS0_HTM_IMA_PDBAR , RULL(0x1501260B), SH_UNT_EX_11_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_10_CHTMLBS1_HTM_IMA_PDBAR , RULL(0x1501270B), SH_UNT_EX_10_CHTMLBS1, +REG64( EX_11_CHTMLBS1_HTM_IMA_PDBAR , RULL(0x1501270B), SH_UNT_EX_11_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_2_CHTMLBS0_HTM_IMA_PDBAR , RULL(0x1101260B), SH_UNT_EX_2_CHTMLBS0, +REG64( EX_1_CHTMLBS0_HTM_IMA_PDBAR , RULL(0x1001260B), SH_UNT_EX_1_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_2_CHTMLBS1_HTM_IMA_PDBAR , RULL(0x1101270B), SH_UNT_EX_2_CHTMLBS1, +REG64( EX_1_CHTMLBS1_HTM_IMA_PDBAR , RULL(0x1001270B), SH_UNT_EX_1_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_4_CHTMLBS0_HTM_IMA_PDBAR , RULL(0x1201260B), SH_UNT_EX_4_CHTMLBS0, +REG64( EX_3_CHTMLBS0_HTM_IMA_PDBAR , RULL(0x1101260B), SH_UNT_EX_3_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_4_CHTMLBS1_HTM_IMA_PDBAR , RULL(0x1201270B), SH_UNT_EX_4_CHTMLBS1, +REG64( EX_3_CHTMLBS1_HTM_IMA_PDBAR , RULL(0x1101270B), SH_UNT_EX_3_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_6_CHTMLBS0_HTM_IMA_PDBAR , RULL(0x1301260B), SH_UNT_EX_6_CHTMLBS0, +REG64( EX_5_CHTMLBS0_HTM_IMA_PDBAR , RULL(0x1201260B), SH_UNT_EX_5_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_6_CHTMLBS1_HTM_IMA_PDBAR , RULL(0x1301270B), SH_UNT_EX_6_CHTMLBS1, +REG64( EX_5_CHTMLBS1_HTM_IMA_PDBAR , RULL(0x1201270B), SH_UNT_EX_5_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_8_CHTMLBS0_HTM_IMA_PDBAR , RULL(0x1401260B), SH_UNT_EX_8_CHTMLBS0, +REG64( EX_7_CHTMLBS0_HTM_IMA_PDBAR , RULL(0x1301260B), SH_UNT_EX_7_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_8_CHTMLBS1_HTM_IMA_PDBAR , RULL(0x1401270B), SH_UNT_EX_8_CHTMLBS1, +REG64( EX_7_CHTMLBS1_HTM_IMA_PDBAR , RULL(0x1301270B), SH_UNT_EX_7_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_CHTMLBS0_HTM_IMA_PDBAR , RULL(0x1001260B), SH_UNT_EX_CHTMLBS0, +REG64( EX_9_CHTMLBS0_HTM_IMA_PDBAR , RULL(0x1401260B), SH_UNT_EX_9_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_CHTMLBS1_HTM_IMA_PDBAR , RULL(0x1001270B), SH_UNT_EX_CHTMLBS1, +REG64( EX_9_CHTMLBS1_HTM_IMA_PDBAR , RULL(0x1401270B), SH_UNT_EX_9_CHTMLBS1, SH_ACS_SCOM_RW ); REG64( EQ_HTM_IMA_STATUS , RULL(0x1001260A), SH_UNT_EQ , @@ -11372,33 +11806,43 @@ REG64( EQ_4_HTM_IMA_STATUS , RULL(0x1401260A SH_ACS_SCOM_RO ); //DUPS: 1401270A, 1401220A, 1401230A, REG64( EQ_5_HTM_IMA_STATUS , RULL(0x1501260A), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); //DUPS: 1501270A, 1501220A, 1501230A, -REG64( EX_0_CHTMLBS0_HTM_IMA_STATUS , RULL(0x1001260A), SH_UNT_EX_0_CHTMLBS0, +REG64( EX_HTM_IMA_STATUS , RULL(0x1001220A), SH_UNT_EX , + SH_ACS_SCOM_RO ); //DUPS: 1001230A, +REG64( EX_0_HTM_IMA_STATUS , RULL(0x1001220A), SH_UNT_EX_0 , + SH_ACS_SCOM_RO ); //DUPS: 1001230A, +REG64( EX_2_HTM_IMA_STATUS , RULL(0x1101220A), SH_UNT_EX_2 , + SH_ACS_SCOM_RO ); //DUPS: 1101230A, +REG64( EX_4_HTM_IMA_STATUS , RULL(0x1201220A), SH_UNT_EX_4 , + SH_ACS_SCOM_RO ); //DUPS: 1201230A, +REG64( EX_6_HTM_IMA_STATUS , RULL(0x1301220A), SH_UNT_EX_6 , + SH_ACS_SCOM_RO ); //DUPS: 1301230A, +REG64( EX_8_HTM_IMA_STATUS , RULL(0x1401220A), SH_UNT_EX_8 , + SH_ACS_SCOM_RO ); //DUPS: 1401230A, +REG64( EX_10_HTM_IMA_STATUS , RULL(0x1501220A), SH_UNT_EX_10 , + SH_ACS_SCOM_RO ); //DUPS: 1501230A, +REG64( EX_11_CHTMLBS0_HTM_IMA_STATUS , RULL(0x1501260A), SH_UNT_EX_11_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_0_CHTMLBS1_HTM_IMA_STATUS , RULL(0x1001270A), SH_UNT_EX_0_CHTMLBS1, +REG64( EX_11_CHTMLBS1_HTM_IMA_STATUS , RULL(0x1501270A), SH_UNT_EX_11_CHTMLBS1, SH_ACS_SCOM_RO ); -REG64( EX_10_CHTMLBS0_HTM_IMA_STATUS , RULL(0x1501260A), SH_UNT_EX_10_CHTMLBS0, +REG64( EX_1_CHTMLBS0_HTM_IMA_STATUS , RULL(0x1001260A), SH_UNT_EX_1_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_10_CHTMLBS1_HTM_IMA_STATUS , RULL(0x1501270A), SH_UNT_EX_10_CHTMLBS1, +REG64( EX_1_CHTMLBS1_HTM_IMA_STATUS , RULL(0x1001270A), SH_UNT_EX_1_CHTMLBS1, SH_ACS_SCOM_RO ); -REG64( EX_2_CHTMLBS0_HTM_IMA_STATUS , RULL(0x1101260A), SH_UNT_EX_2_CHTMLBS0, +REG64( EX_3_CHTMLBS0_HTM_IMA_STATUS , RULL(0x1101260A), SH_UNT_EX_3_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_2_CHTMLBS1_HTM_IMA_STATUS , RULL(0x1101270A), SH_UNT_EX_2_CHTMLBS1, +REG64( EX_3_CHTMLBS1_HTM_IMA_STATUS , RULL(0x1101270A), SH_UNT_EX_3_CHTMLBS1, SH_ACS_SCOM_RO ); -REG64( EX_4_CHTMLBS0_HTM_IMA_STATUS , RULL(0x1201260A), SH_UNT_EX_4_CHTMLBS0, +REG64( EX_5_CHTMLBS0_HTM_IMA_STATUS , RULL(0x1201260A), SH_UNT_EX_5_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_4_CHTMLBS1_HTM_IMA_STATUS , RULL(0x1201270A), SH_UNT_EX_4_CHTMLBS1, +REG64( EX_5_CHTMLBS1_HTM_IMA_STATUS , RULL(0x1201270A), SH_UNT_EX_5_CHTMLBS1, SH_ACS_SCOM_RO ); -REG64( EX_6_CHTMLBS0_HTM_IMA_STATUS , RULL(0x1301260A), SH_UNT_EX_6_CHTMLBS0, +REG64( EX_7_CHTMLBS0_HTM_IMA_STATUS , RULL(0x1301260A), SH_UNT_EX_7_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_6_CHTMLBS1_HTM_IMA_STATUS , RULL(0x1301270A), SH_UNT_EX_6_CHTMLBS1, +REG64( EX_7_CHTMLBS1_HTM_IMA_STATUS , RULL(0x1301270A), SH_UNT_EX_7_CHTMLBS1, SH_ACS_SCOM_RO ); -REG64( EX_8_CHTMLBS0_HTM_IMA_STATUS , RULL(0x1401260A), SH_UNT_EX_8_CHTMLBS0, +REG64( EX_9_CHTMLBS0_HTM_IMA_STATUS , RULL(0x1401260A), SH_UNT_EX_9_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_8_CHTMLBS1_HTM_IMA_STATUS , RULL(0x1401270A), SH_UNT_EX_8_CHTMLBS1, - SH_ACS_SCOM_RO ); -REG64( EX_CHTMLBS0_HTM_IMA_STATUS , RULL(0x1001260A), SH_UNT_EX_CHTMLBS0, - SH_ACS_SCOM_RO ); -REG64( EX_CHTMLBS1_HTM_IMA_STATUS , RULL(0x1001270A), SH_UNT_EX_CHTMLBS1, +REG64( EX_9_CHTMLBS1_HTM_IMA_STATUS , RULL(0x1401270A), SH_UNT_EX_9_CHTMLBS1, SH_ACS_SCOM_RO ); REG64( EQ_HTM_LAST , RULL(0x10012603), SH_UNT_EQ , @@ -11415,33 +11859,43 @@ REG64( EQ_4_HTM_LAST , RULL(0x14012603 SH_ACS_SCOM_RO ); //DUPS: 14012703, 14012203, 14012303, REG64( EQ_5_HTM_LAST , RULL(0x15012603), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); //DUPS: 15012703, 15012203, 15012303, -REG64( EX_0_CHTMLBS0_HTM_LAST , RULL(0x10012603), SH_UNT_EX_0_CHTMLBS0, - SH_ACS_SCOM_RO ); -REG64( EX_0_CHTMLBS1_HTM_LAST , RULL(0x10012703), SH_UNT_EX_0_CHTMLBS1, - SH_ACS_SCOM_RO ); -REG64( EX_10_CHTMLBS0_HTM_LAST , RULL(0x15012603), SH_UNT_EX_10_CHTMLBS0, +REG64( EX_HTM_LAST , RULL(0x10012203), SH_UNT_EX , + SH_ACS_SCOM_RO ); //DUPS: 10012303, +REG64( EX_0_HTM_LAST , RULL(0x10012203), SH_UNT_EX_0 , + SH_ACS_SCOM_RO ); //DUPS: 10012303, +REG64( EX_2_HTM_LAST , RULL(0x11012203), SH_UNT_EX_2 , + SH_ACS_SCOM_RO ); //DUPS: 11012303, +REG64( EX_4_HTM_LAST , RULL(0x12012203), SH_UNT_EX_4 , + SH_ACS_SCOM_RO ); //DUPS: 12012303, +REG64( EX_6_HTM_LAST , RULL(0x13012203), SH_UNT_EX_6 , + SH_ACS_SCOM_RO ); //DUPS: 13012303, +REG64( EX_8_HTM_LAST , RULL(0x14012203), SH_UNT_EX_8 , + SH_ACS_SCOM_RO ); //DUPS: 14012303, +REG64( EX_10_HTM_LAST , RULL(0x15012203), SH_UNT_EX_10 , + SH_ACS_SCOM_RO ); //DUPS: 15012303, +REG64( EX_11_CHTMLBS0_HTM_LAST , RULL(0x15012603), SH_UNT_EX_11_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_10_CHTMLBS1_HTM_LAST , RULL(0x15012703), SH_UNT_EX_10_CHTMLBS1, +REG64( EX_11_CHTMLBS1_HTM_LAST , RULL(0x15012703), SH_UNT_EX_11_CHTMLBS1, SH_ACS_SCOM_RO ); -REG64( EX_2_CHTMLBS0_HTM_LAST , RULL(0x11012603), SH_UNT_EX_2_CHTMLBS0, +REG64( EX_1_CHTMLBS0_HTM_LAST , RULL(0x10012603), SH_UNT_EX_1_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_2_CHTMLBS1_HTM_LAST , RULL(0x11012703), SH_UNT_EX_2_CHTMLBS1, +REG64( EX_1_CHTMLBS1_HTM_LAST , RULL(0x10012703), SH_UNT_EX_1_CHTMLBS1, SH_ACS_SCOM_RO ); -REG64( EX_4_CHTMLBS0_HTM_LAST , RULL(0x12012603), SH_UNT_EX_4_CHTMLBS0, +REG64( EX_3_CHTMLBS0_HTM_LAST , RULL(0x11012603), SH_UNT_EX_3_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_4_CHTMLBS1_HTM_LAST , RULL(0x12012703), SH_UNT_EX_4_CHTMLBS1, +REG64( EX_3_CHTMLBS1_HTM_LAST , RULL(0x11012703), SH_UNT_EX_3_CHTMLBS1, SH_ACS_SCOM_RO ); -REG64( EX_6_CHTMLBS0_HTM_LAST , RULL(0x13012603), SH_UNT_EX_6_CHTMLBS0, +REG64( EX_5_CHTMLBS0_HTM_LAST , RULL(0x12012603), SH_UNT_EX_5_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_6_CHTMLBS1_HTM_LAST , RULL(0x13012703), SH_UNT_EX_6_CHTMLBS1, +REG64( EX_5_CHTMLBS1_HTM_LAST , RULL(0x12012703), SH_UNT_EX_5_CHTMLBS1, SH_ACS_SCOM_RO ); -REG64( EX_8_CHTMLBS0_HTM_LAST , RULL(0x14012603), SH_UNT_EX_8_CHTMLBS0, +REG64( EX_7_CHTMLBS0_HTM_LAST , RULL(0x13012603), SH_UNT_EX_7_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_8_CHTMLBS1_HTM_LAST , RULL(0x14012703), SH_UNT_EX_8_CHTMLBS1, +REG64( EX_7_CHTMLBS1_HTM_LAST , RULL(0x13012703), SH_UNT_EX_7_CHTMLBS1, SH_ACS_SCOM_RO ); -REG64( EX_CHTMLBS0_HTM_LAST , RULL(0x10012603), SH_UNT_EX_CHTMLBS0, +REG64( EX_9_CHTMLBS0_HTM_LAST , RULL(0x14012603), SH_UNT_EX_9_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_CHTMLBS1_HTM_LAST , RULL(0x10012703), SH_UNT_EX_CHTMLBS1, +REG64( EX_9_CHTMLBS1_HTM_LAST , RULL(0x14012703), SH_UNT_EX_9_CHTMLBS1, SH_ACS_SCOM_RO ); REG64( EQ_HTM_MEM , RULL(0x10012601), SH_UNT_EQ , @@ -11458,33 +11912,43 @@ REG64( EQ_4_HTM_MEM , RULL(0x14012601 SH_ACS_SCOM_RW ); //DUPS: 14012701, 14012201, 14012301, REG64( EQ_5_HTM_MEM , RULL(0x15012601), SH_UNT_EQ_5 , SH_ACS_SCOM_RW ); //DUPS: 15012701, 15012201, 15012301, -REG64( EX_0_CHTMLBS0_HTM_MEM , RULL(0x10012601), SH_UNT_EX_0_CHTMLBS0, +REG64( EX_HTM_MEM , RULL(0x10012201), SH_UNT_EX , + SH_ACS_SCOM_RW ); //DUPS: 10012301, +REG64( EX_0_HTM_MEM , RULL(0x10012201), SH_UNT_EX_0 , + SH_ACS_SCOM_RW ); //DUPS: 10012301, +REG64( EX_2_HTM_MEM , RULL(0x11012201), SH_UNT_EX_2 , + SH_ACS_SCOM_RW ); //DUPS: 11012301, +REG64( EX_4_HTM_MEM , RULL(0x12012201), SH_UNT_EX_4 , + SH_ACS_SCOM_RW ); //DUPS: 12012301, +REG64( EX_6_HTM_MEM , RULL(0x13012201), SH_UNT_EX_6 , + SH_ACS_SCOM_RW ); //DUPS: 13012301, +REG64( EX_8_HTM_MEM , RULL(0x14012201), SH_UNT_EX_8 , + SH_ACS_SCOM_RW ); //DUPS: 14012301, +REG64( EX_10_HTM_MEM , RULL(0x15012201), SH_UNT_EX_10 , + SH_ACS_SCOM_RW ); //DUPS: 15012301, +REG64( EX_11_CHTMLBS0_HTM_MEM , RULL(0x15012601), SH_UNT_EX_11_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_0_CHTMLBS1_HTM_MEM , RULL(0x10012701), SH_UNT_EX_0_CHTMLBS1, +REG64( EX_11_CHTMLBS1_HTM_MEM , RULL(0x15012701), SH_UNT_EX_11_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_10_CHTMLBS0_HTM_MEM , RULL(0x15012601), SH_UNT_EX_10_CHTMLBS0, +REG64( EX_1_CHTMLBS0_HTM_MEM , RULL(0x10012601), SH_UNT_EX_1_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_10_CHTMLBS1_HTM_MEM , RULL(0x15012701), SH_UNT_EX_10_CHTMLBS1, +REG64( EX_1_CHTMLBS1_HTM_MEM , RULL(0x10012701), SH_UNT_EX_1_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_2_CHTMLBS0_HTM_MEM , RULL(0x11012601), SH_UNT_EX_2_CHTMLBS0, +REG64( EX_3_CHTMLBS0_HTM_MEM , RULL(0x11012601), SH_UNT_EX_3_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_2_CHTMLBS1_HTM_MEM , RULL(0x11012701), SH_UNT_EX_2_CHTMLBS1, +REG64( EX_3_CHTMLBS1_HTM_MEM , RULL(0x11012701), SH_UNT_EX_3_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_4_CHTMLBS0_HTM_MEM , RULL(0x12012601), SH_UNT_EX_4_CHTMLBS0, +REG64( EX_5_CHTMLBS0_HTM_MEM , RULL(0x12012601), SH_UNT_EX_5_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_4_CHTMLBS1_HTM_MEM , RULL(0x12012701), SH_UNT_EX_4_CHTMLBS1, +REG64( EX_5_CHTMLBS1_HTM_MEM , RULL(0x12012701), SH_UNT_EX_5_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_6_CHTMLBS0_HTM_MEM , RULL(0x13012601), SH_UNT_EX_6_CHTMLBS0, +REG64( EX_7_CHTMLBS0_HTM_MEM , RULL(0x13012601), SH_UNT_EX_7_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_6_CHTMLBS1_HTM_MEM , RULL(0x13012701), SH_UNT_EX_6_CHTMLBS1, +REG64( EX_7_CHTMLBS1_HTM_MEM , RULL(0x13012701), SH_UNT_EX_7_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_8_CHTMLBS0_HTM_MEM , RULL(0x14012601), SH_UNT_EX_8_CHTMLBS0, +REG64( EX_9_CHTMLBS0_HTM_MEM , RULL(0x14012601), SH_UNT_EX_9_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_8_CHTMLBS1_HTM_MEM , RULL(0x14012701), SH_UNT_EX_8_CHTMLBS1, - SH_ACS_SCOM_RW ); -REG64( EX_CHTMLBS0_HTM_MEM , RULL(0x10012601), SH_UNT_EX_CHTMLBS0, - SH_ACS_SCOM_RW ); -REG64( EX_CHTMLBS1_HTM_MEM , RULL(0x10012701), SH_UNT_EX_CHTMLBS1, +REG64( EX_9_CHTMLBS1_HTM_MEM , RULL(0x14012701), SH_UNT_EX_9_CHTMLBS1, SH_ACS_SCOM_RW ); REG64( EQ_HTM_MODE , RULL(0x10012600), SH_UNT_EQ , @@ -11501,33 +11965,43 @@ REG64( EQ_4_HTM_MODE , RULL(0x14012600 SH_ACS_SCOM_RW ); //DUPS: 14012700, 14012200, 14012300, REG64( EQ_5_HTM_MODE , RULL(0x15012600), SH_UNT_EQ_5 , SH_ACS_SCOM_RW ); //DUPS: 15012700, 15012200, 15012300, -REG64( EX_0_CHTMLBS0_HTM_MODE , RULL(0x10012600), SH_UNT_EX_0_CHTMLBS0, - SH_ACS_SCOM_RW ); -REG64( EX_0_CHTMLBS1_HTM_MODE , RULL(0x10012700), SH_UNT_EX_0_CHTMLBS1, - SH_ACS_SCOM_RW ); -REG64( EX_10_CHTMLBS0_HTM_MODE , RULL(0x15012600), SH_UNT_EX_10_CHTMLBS0, +REG64( EX_HTM_MODE , RULL(0x10012200), SH_UNT_EX , + SH_ACS_SCOM_RW ); //DUPS: 10012300, +REG64( EX_0_HTM_MODE , RULL(0x10012200), SH_UNT_EX_0 , + SH_ACS_SCOM_RW ); //DUPS: 10012300, +REG64( EX_2_HTM_MODE , RULL(0x11012200), SH_UNT_EX_2 , + SH_ACS_SCOM_RW ); //DUPS: 11012300, +REG64( EX_4_HTM_MODE , RULL(0x12012200), SH_UNT_EX_4 , + SH_ACS_SCOM_RW ); //DUPS: 12012300, +REG64( EX_6_HTM_MODE , RULL(0x13012200), SH_UNT_EX_6 , + SH_ACS_SCOM_RW ); //DUPS: 13012300, +REG64( EX_8_HTM_MODE , RULL(0x14012200), SH_UNT_EX_8 , + SH_ACS_SCOM_RW ); //DUPS: 14012300, +REG64( EX_10_HTM_MODE , RULL(0x15012200), SH_UNT_EX_10 , + SH_ACS_SCOM_RW ); //DUPS: 15012300, +REG64( EX_11_CHTMLBS0_HTM_MODE , RULL(0x15012600), SH_UNT_EX_11_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_10_CHTMLBS1_HTM_MODE , RULL(0x15012700), SH_UNT_EX_10_CHTMLBS1, +REG64( EX_11_CHTMLBS1_HTM_MODE , RULL(0x15012700), SH_UNT_EX_11_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_2_CHTMLBS0_HTM_MODE , RULL(0x11012600), SH_UNT_EX_2_CHTMLBS0, +REG64( EX_1_CHTMLBS0_HTM_MODE , RULL(0x10012600), SH_UNT_EX_1_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_2_CHTMLBS1_HTM_MODE , RULL(0x11012700), SH_UNT_EX_2_CHTMLBS1, +REG64( EX_1_CHTMLBS1_HTM_MODE , RULL(0x10012700), SH_UNT_EX_1_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_4_CHTMLBS0_HTM_MODE , RULL(0x12012600), SH_UNT_EX_4_CHTMLBS0, +REG64( EX_3_CHTMLBS0_HTM_MODE , RULL(0x11012600), SH_UNT_EX_3_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_4_CHTMLBS1_HTM_MODE , RULL(0x12012700), SH_UNT_EX_4_CHTMLBS1, +REG64( EX_3_CHTMLBS1_HTM_MODE , RULL(0x11012700), SH_UNT_EX_3_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_6_CHTMLBS0_HTM_MODE , RULL(0x13012600), SH_UNT_EX_6_CHTMLBS0, +REG64( EX_5_CHTMLBS0_HTM_MODE , RULL(0x12012600), SH_UNT_EX_5_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_6_CHTMLBS1_HTM_MODE , RULL(0x13012700), SH_UNT_EX_6_CHTMLBS1, +REG64( EX_5_CHTMLBS1_HTM_MODE , RULL(0x12012700), SH_UNT_EX_5_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_8_CHTMLBS0_HTM_MODE , RULL(0x14012600), SH_UNT_EX_8_CHTMLBS0, +REG64( EX_7_CHTMLBS0_HTM_MODE , RULL(0x13012600), SH_UNT_EX_7_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_8_CHTMLBS1_HTM_MODE , RULL(0x14012700), SH_UNT_EX_8_CHTMLBS1, +REG64( EX_7_CHTMLBS1_HTM_MODE , RULL(0x13012700), SH_UNT_EX_7_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_CHTMLBS0_HTM_MODE , RULL(0x10012600), SH_UNT_EX_CHTMLBS0, +REG64( EX_9_CHTMLBS0_HTM_MODE , RULL(0x14012600), SH_UNT_EX_9_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_CHTMLBS1_HTM_MODE , RULL(0x10012700), SH_UNT_EX_CHTMLBS1, +REG64( EX_9_CHTMLBS1_HTM_MODE , RULL(0x14012700), SH_UNT_EX_9_CHTMLBS1, SH_ACS_SCOM_RW ); REG64( EQ_HTM_STAT , RULL(0x10012602), SH_UNT_EQ , @@ -11544,33 +12018,43 @@ REG64( EQ_4_HTM_STAT , RULL(0x14012602 SH_ACS_SCOM_RO ); //DUPS: 14012702, 14012202, 14012302, REG64( EQ_5_HTM_STAT , RULL(0x15012602), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); //DUPS: 15012702, 15012202, 15012302, -REG64( EX_0_CHTMLBS0_HTM_STAT , RULL(0x10012602), SH_UNT_EX_0_CHTMLBS0, +REG64( EX_HTM_STAT , RULL(0x10012202), SH_UNT_EX , + SH_ACS_SCOM_RO ); //DUPS: 10012302, +REG64( EX_0_HTM_STAT , RULL(0x10012202), SH_UNT_EX_0 , + SH_ACS_SCOM_RO ); //DUPS: 10012302, +REG64( EX_2_HTM_STAT , RULL(0x11012202), SH_UNT_EX_2 , + SH_ACS_SCOM_RO ); //DUPS: 11012302, +REG64( EX_4_HTM_STAT , RULL(0x12012202), SH_UNT_EX_4 , + SH_ACS_SCOM_RO ); //DUPS: 12012302, +REG64( EX_6_HTM_STAT , RULL(0x13012202), SH_UNT_EX_6 , + SH_ACS_SCOM_RO ); //DUPS: 13012302, +REG64( EX_8_HTM_STAT , RULL(0x14012202), SH_UNT_EX_8 , + SH_ACS_SCOM_RO ); //DUPS: 14012302, +REG64( EX_10_HTM_STAT , RULL(0x15012202), SH_UNT_EX_10 , + SH_ACS_SCOM_RO ); //DUPS: 15012302, +REG64( EX_11_CHTMLBS0_HTM_STAT , RULL(0x15012602), SH_UNT_EX_11_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_0_CHTMLBS1_HTM_STAT , RULL(0x10012702), SH_UNT_EX_0_CHTMLBS1, +REG64( EX_11_CHTMLBS1_HTM_STAT , RULL(0x15012702), SH_UNT_EX_11_CHTMLBS1, SH_ACS_SCOM_RO ); -REG64( EX_10_CHTMLBS0_HTM_STAT , RULL(0x15012602), SH_UNT_EX_10_CHTMLBS0, +REG64( EX_1_CHTMLBS0_HTM_STAT , RULL(0x10012602), SH_UNT_EX_1_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_10_CHTMLBS1_HTM_STAT , RULL(0x15012702), SH_UNT_EX_10_CHTMLBS1, +REG64( EX_1_CHTMLBS1_HTM_STAT , RULL(0x10012702), SH_UNT_EX_1_CHTMLBS1, SH_ACS_SCOM_RO ); -REG64( EX_2_CHTMLBS0_HTM_STAT , RULL(0x11012602), SH_UNT_EX_2_CHTMLBS0, +REG64( EX_3_CHTMLBS0_HTM_STAT , RULL(0x11012602), SH_UNT_EX_3_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_2_CHTMLBS1_HTM_STAT , RULL(0x11012702), SH_UNT_EX_2_CHTMLBS1, +REG64( EX_3_CHTMLBS1_HTM_STAT , RULL(0x11012702), SH_UNT_EX_3_CHTMLBS1, SH_ACS_SCOM_RO ); -REG64( EX_4_CHTMLBS0_HTM_STAT , RULL(0x12012602), SH_UNT_EX_4_CHTMLBS0, +REG64( EX_5_CHTMLBS0_HTM_STAT , RULL(0x12012602), SH_UNT_EX_5_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_4_CHTMLBS1_HTM_STAT , RULL(0x12012702), SH_UNT_EX_4_CHTMLBS1, +REG64( EX_5_CHTMLBS1_HTM_STAT , RULL(0x12012702), SH_UNT_EX_5_CHTMLBS1, SH_ACS_SCOM_RO ); -REG64( EX_6_CHTMLBS0_HTM_STAT , RULL(0x13012602), SH_UNT_EX_6_CHTMLBS0, +REG64( EX_7_CHTMLBS0_HTM_STAT , RULL(0x13012602), SH_UNT_EX_7_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_6_CHTMLBS1_HTM_STAT , RULL(0x13012702), SH_UNT_EX_6_CHTMLBS1, +REG64( EX_7_CHTMLBS1_HTM_STAT , RULL(0x13012702), SH_UNT_EX_7_CHTMLBS1, SH_ACS_SCOM_RO ); -REG64( EX_8_CHTMLBS0_HTM_STAT , RULL(0x14012602), SH_UNT_EX_8_CHTMLBS0, +REG64( EX_9_CHTMLBS0_HTM_STAT , RULL(0x14012602), SH_UNT_EX_9_CHTMLBS0, SH_ACS_SCOM_RO ); -REG64( EX_8_CHTMLBS1_HTM_STAT , RULL(0x14012702), SH_UNT_EX_8_CHTMLBS1, - SH_ACS_SCOM_RO ); -REG64( EX_CHTMLBS0_HTM_STAT , RULL(0x10012602), SH_UNT_EX_CHTMLBS0, - SH_ACS_SCOM_RO ); -REG64( EX_CHTMLBS1_HTM_STAT , RULL(0x10012702), SH_UNT_EX_CHTMLBS1, +REG64( EX_9_CHTMLBS1_HTM_STAT , RULL(0x14012702), SH_UNT_EX_9_CHTMLBS1, SH_ACS_SCOM_RO ); REG64( EQ_HTM_TRIG , RULL(0x10012604), SH_UNT_EQ , @@ -11587,33 +12071,43 @@ REG64( EQ_4_HTM_TRIG , RULL(0x14012604 SH_ACS_SCOM_RW ); //DUPS: 14012704, 14012204, 14012304, REG64( EQ_5_HTM_TRIG , RULL(0x15012604), SH_UNT_EQ_5 , SH_ACS_SCOM_RW ); //DUPS: 15012704, 15012204, 15012304, -REG64( EX_0_CHTMLBS0_HTM_TRIG , RULL(0x10012604), SH_UNT_EX_0_CHTMLBS0, - SH_ACS_SCOM_RW ); -REG64( EX_0_CHTMLBS1_HTM_TRIG , RULL(0x10012704), SH_UNT_EX_0_CHTMLBS1, - SH_ACS_SCOM_RW ); -REG64( EX_10_CHTMLBS0_HTM_TRIG , RULL(0x15012604), SH_UNT_EX_10_CHTMLBS0, +REG64( EX_HTM_TRIG , RULL(0x10012204), SH_UNT_EX , + SH_ACS_SCOM_RW ); //DUPS: 10012304, +REG64( EX_0_HTM_TRIG , RULL(0x10012204), SH_UNT_EX_0 , + SH_ACS_SCOM_RW ); //DUPS: 10012304, +REG64( EX_2_HTM_TRIG , RULL(0x11012204), SH_UNT_EX_2 , + SH_ACS_SCOM_RW ); //DUPS: 11012304, +REG64( EX_4_HTM_TRIG , RULL(0x12012204), SH_UNT_EX_4 , + SH_ACS_SCOM_RW ); //DUPS: 12012304, +REG64( EX_6_HTM_TRIG , RULL(0x13012204), SH_UNT_EX_6 , + SH_ACS_SCOM_RW ); //DUPS: 13012304, +REG64( EX_8_HTM_TRIG , RULL(0x14012204), SH_UNT_EX_8 , + SH_ACS_SCOM_RW ); //DUPS: 14012304, +REG64( EX_10_HTM_TRIG , RULL(0x15012204), SH_UNT_EX_10 , + SH_ACS_SCOM_RW ); //DUPS: 15012304, +REG64( EX_11_CHTMLBS0_HTM_TRIG , RULL(0x15012604), SH_UNT_EX_11_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_10_CHTMLBS1_HTM_TRIG , RULL(0x15012704), SH_UNT_EX_10_CHTMLBS1, +REG64( EX_11_CHTMLBS1_HTM_TRIG , RULL(0x15012704), SH_UNT_EX_11_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_2_CHTMLBS0_HTM_TRIG , RULL(0x11012604), SH_UNT_EX_2_CHTMLBS0, +REG64( EX_1_CHTMLBS0_HTM_TRIG , RULL(0x10012604), SH_UNT_EX_1_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_2_CHTMLBS1_HTM_TRIG , RULL(0x11012704), SH_UNT_EX_2_CHTMLBS1, +REG64( EX_1_CHTMLBS1_HTM_TRIG , RULL(0x10012704), SH_UNT_EX_1_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_4_CHTMLBS0_HTM_TRIG , RULL(0x12012604), SH_UNT_EX_4_CHTMLBS0, +REG64( EX_3_CHTMLBS0_HTM_TRIG , RULL(0x11012604), SH_UNT_EX_3_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_4_CHTMLBS1_HTM_TRIG , RULL(0x12012704), SH_UNT_EX_4_CHTMLBS1, +REG64( EX_3_CHTMLBS1_HTM_TRIG , RULL(0x11012704), SH_UNT_EX_3_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_6_CHTMLBS0_HTM_TRIG , RULL(0x13012604), SH_UNT_EX_6_CHTMLBS0, +REG64( EX_5_CHTMLBS0_HTM_TRIG , RULL(0x12012604), SH_UNT_EX_5_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_6_CHTMLBS1_HTM_TRIG , RULL(0x13012704), SH_UNT_EX_6_CHTMLBS1, +REG64( EX_5_CHTMLBS1_HTM_TRIG , RULL(0x12012704), SH_UNT_EX_5_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_8_CHTMLBS0_HTM_TRIG , RULL(0x14012604), SH_UNT_EX_8_CHTMLBS0, +REG64( EX_7_CHTMLBS0_HTM_TRIG , RULL(0x13012604), SH_UNT_EX_7_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_8_CHTMLBS1_HTM_TRIG , RULL(0x14012704), SH_UNT_EX_8_CHTMLBS1, +REG64( EX_7_CHTMLBS1_HTM_TRIG , RULL(0x13012704), SH_UNT_EX_7_CHTMLBS1, SH_ACS_SCOM_RW ); -REG64( EX_CHTMLBS0_HTM_TRIG , RULL(0x10012604), SH_UNT_EX_CHTMLBS0, +REG64( EX_9_CHTMLBS0_HTM_TRIG , RULL(0x14012604), SH_UNT_EX_9_CHTMLBS0, SH_ACS_SCOM_RW ); -REG64( EX_CHTMLBS1_HTM_TRIG , RULL(0x10012704), SH_UNT_EX_CHTMLBS1, +REG64( EX_9_CHTMLBS1_HTM_TRIG , RULL(0x14012704), SH_UNT_EX_9_CHTMLBS1, SH_ACS_SCOM_RW ); REG64( C_HV_STATE , RULL(0x20010AA6), SH_UNT_C , SH_ACS_SCOM_RO ); @@ -13627,13 +14121,19 @@ REG64( EQ_4_MIB_XIICAC , RULL(0x14012419 SH_ACS_SCOM_RO ); //DUPS: 14012019, REG64( EQ_5_MIB_XIICAC , RULL(0x15012419), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); //DUPS: 15012019, -REG64( EX_MIB_XIICAC , RULL(0x10012419), SH_UNT_EX , SH_ACS_SCOM_RO ); -REG64( EX_0_MIB_XIICAC , RULL(0x10012419), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); -REG64( EX_2_MIB_XIICAC , RULL(0x11012419), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); -REG64( EX_4_MIB_XIICAC , RULL(0x12012419), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); -REG64( EX_6_MIB_XIICAC , RULL(0x13012419), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); -REG64( EX_8_MIB_XIICAC , RULL(0x14012419), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); -REG64( EX_10_MIB_XIICAC , RULL(0x15012419), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_MIB_XIICAC , RULL(0x10012019), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_0_MIB_XIICAC , RULL(0x10012019), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_1_MIB_XIICAC , RULL(0x10012419), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); +REG64( EX_2_MIB_XIICAC , RULL(0x11012019), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_3_MIB_XIICAC , RULL(0x11012419), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); +REG64( EX_4_MIB_XIICAC , RULL(0x12012019), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_5_MIB_XIICAC , RULL(0x12012419), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); +REG64( EX_6_MIB_XIICAC , RULL(0x13012019), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_7_MIB_XIICAC , RULL(0x13012419), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); +REG64( EX_8_MIB_XIICAC , RULL(0x14012019), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_9_MIB_XIICAC , RULL(0x14012419), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); +REG64( EX_10_MIB_XIICAC , RULL(0x15012019), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_11_MIB_XIICAC , RULL(0x15012419), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_MIB_XIMEM , RULL(0x10012417), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 10012017, @@ -13649,13 +14149,19 @@ REG64( EQ_4_MIB_XIMEM , RULL(0x14012417 SH_ACS_SCOM_RO ); //DUPS: 14012017, REG64( EQ_5_MIB_XIMEM , RULL(0x15012417), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); //DUPS: 15012017, -REG64( EX_MIB_XIMEM , RULL(0x10012417), SH_UNT_EX , SH_ACS_SCOM_RO ); -REG64( EX_0_MIB_XIMEM , RULL(0x10012417), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); -REG64( EX_2_MIB_XIMEM , RULL(0x11012417), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); -REG64( EX_4_MIB_XIMEM , RULL(0x12012417), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); -REG64( EX_6_MIB_XIMEM , RULL(0x13012417), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); -REG64( EX_8_MIB_XIMEM , RULL(0x14012417), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); -REG64( EX_10_MIB_XIMEM , RULL(0x15012417), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_MIB_XIMEM , RULL(0x10012017), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_0_MIB_XIMEM , RULL(0x10012017), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_1_MIB_XIMEM , RULL(0x10012417), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); +REG64( EX_2_MIB_XIMEM , RULL(0x11012017), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_3_MIB_XIMEM , RULL(0x11012417), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); +REG64( EX_4_MIB_XIMEM , RULL(0x12012017), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_5_MIB_XIMEM , RULL(0x12012417), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); +REG64( EX_6_MIB_XIMEM , RULL(0x13012017), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_7_MIB_XIMEM , RULL(0x13012417), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); +REG64( EX_8_MIB_XIMEM , RULL(0x14012017), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_9_MIB_XIMEM , RULL(0x14012417), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); +REG64( EX_10_MIB_XIMEM , RULL(0x15012017), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_11_MIB_XIMEM , RULL(0x15012417), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_MIB_XISGB , RULL(0x10012418), SH_UNT_EQ , SH_ACS_SCOM_RO ); //DUPS: 10012018, @@ -13671,13 +14177,19 @@ REG64( EQ_4_MIB_XISGB , RULL(0x14012418 SH_ACS_SCOM_RO ); //DUPS: 14012018, REG64( EQ_5_MIB_XISGB , RULL(0x15012418), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); //DUPS: 15012018, -REG64( EX_MIB_XISGB , RULL(0x10012418), SH_UNT_EX , SH_ACS_SCOM_RO ); -REG64( EX_0_MIB_XISGB , RULL(0x10012418), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); -REG64( EX_2_MIB_XISGB , RULL(0x11012418), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); -REG64( EX_4_MIB_XISGB , RULL(0x12012418), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); -REG64( EX_6_MIB_XISGB , RULL(0x13012418), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); -REG64( EX_8_MIB_XISGB , RULL(0x14012418), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); -REG64( EX_10_MIB_XISGB , RULL(0x15012418), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_MIB_XISGB , RULL(0x10012018), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_0_MIB_XISGB , RULL(0x10012018), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_1_MIB_XISGB , RULL(0x10012418), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); +REG64( EX_2_MIB_XISGB , RULL(0x11012018), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_3_MIB_XISGB , RULL(0x11012418), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); +REG64( EX_4_MIB_XISGB , RULL(0x12012018), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_5_MIB_XISGB , RULL(0x12012418), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); +REG64( EX_6_MIB_XISGB , RULL(0x13012018), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_7_MIB_XISGB , RULL(0x13012418), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); +REG64( EX_8_MIB_XISGB , RULL(0x14012018), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_9_MIB_XISGB , RULL(0x14012418), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); +REG64( EX_10_MIB_XISGB , RULL(0x15012018), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_11_MIB_XISGB , RULL(0x15012418), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( C_MODE_REG , RULL(0x20040008), SH_UNT_C , SH_ACS_SCOM ); REG64( C_0_MODE_REG , RULL(0x20040008), SH_UNT_C_0 , SH_ACS_SCOM ); @@ -15528,13 +16040,19 @@ REG64( EQ_4_PPE_XIDBGPRO , RULL(0x14012415 SH_ACS_SCOM ); //DUPS: 14012015, REG64( EQ_5_PPE_XIDBGPRO , RULL(0x15012415), SH_UNT_EQ_5 , SH_ACS_SCOM ); //DUPS: 15012015, -REG64( EX_PPE_XIDBGPRO , RULL(0x10012415), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_PPE_XIDBGPRO , RULL(0x10012415), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_PPE_XIDBGPRO , RULL(0x11012415), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_PPE_XIDBGPRO , RULL(0x12012415), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_PPE_XIDBGPRO , RULL(0x13012415), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_PPE_XIDBGPRO , RULL(0x14012415), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_PPE_XIDBGPRO , RULL(0x15012415), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_PPE_XIDBGPRO , RULL(0x10012015), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_PPE_XIDBGPRO , RULL(0x10012015), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_1_PPE_XIDBGPRO , RULL(0x10012415), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_2_PPE_XIDBGPRO , RULL(0x11012015), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_3_PPE_XIDBGPRO , RULL(0x11012415), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_4_PPE_XIDBGPRO , RULL(0x12012015), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_5_PPE_XIDBGPRO , RULL(0x12012415), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_6_PPE_XIDBGPRO , RULL(0x13012015), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_7_PPE_XIDBGPRO , RULL(0x13012415), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_8_PPE_XIDBGPRO , RULL(0x14012015), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_9_PPE_XIDBGPRO , RULL(0x14012415), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_10_PPE_XIDBGPRO , RULL(0x15012015), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_11_PPE_XIDBGPRO , RULL(0x15012415), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_PPE_XIRAMDBG , RULL(0x10012413), SH_UNT_EQ , SH_ACS_SCOM ); //DUPS: 10012013, @@ -15550,13 +16068,19 @@ REG64( EQ_4_PPE_XIRAMDBG , RULL(0x14012413 SH_ACS_SCOM ); //DUPS: 14012013, REG64( EQ_5_PPE_XIRAMDBG , RULL(0x15012413), SH_UNT_EQ_5 , SH_ACS_SCOM ); //DUPS: 15012013, -REG64( EX_PPE_XIRAMDBG , RULL(0x10012413), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_PPE_XIRAMDBG , RULL(0x10012413), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_PPE_XIRAMDBG , RULL(0x11012413), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_PPE_XIRAMDBG , RULL(0x12012413), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_PPE_XIRAMDBG , RULL(0x13012413), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_PPE_XIRAMDBG , RULL(0x14012413), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_PPE_XIRAMDBG , RULL(0x15012413), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_PPE_XIRAMDBG , RULL(0x10012013), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_PPE_XIRAMDBG , RULL(0x10012013), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_1_PPE_XIRAMDBG , RULL(0x10012413), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_2_PPE_XIRAMDBG , RULL(0x11012013), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_3_PPE_XIRAMDBG , RULL(0x11012413), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_4_PPE_XIRAMDBG , RULL(0x12012013), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_5_PPE_XIRAMDBG , RULL(0x12012413), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_6_PPE_XIRAMDBG , RULL(0x13012013), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_7_PPE_XIRAMDBG , RULL(0x13012413), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_8_PPE_XIRAMDBG , RULL(0x14012013), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_9_PPE_XIRAMDBG , RULL(0x14012413), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_10_PPE_XIRAMDBG , RULL(0x15012013), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_11_PPE_XIRAMDBG , RULL(0x15012413), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_PPE_XIRAMEDR , RULL(0x10012414), SH_UNT_EQ , SH_ACS_SCOM ); //DUPS: 10012014, @@ -15572,13 +16096,19 @@ REG64( EQ_4_PPE_XIRAMEDR , RULL(0x14012414 SH_ACS_SCOM ); //DUPS: 14012014, REG64( EQ_5_PPE_XIRAMEDR , RULL(0x15012414), SH_UNT_EQ_5 , SH_ACS_SCOM ); //DUPS: 15012014, -REG64( EX_PPE_XIRAMEDR , RULL(0x10012414), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_PPE_XIRAMEDR , RULL(0x10012414), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_PPE_XIRAMEDR , RULL(0x11012414), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_PPE_XIRAMEDR , RULL(0x12012414), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_PPE_XIRAMEDR , RULL(0x13012414), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_PPE_XIRAMEDR , RULL(0x14012414), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_PPE_XIRAMEDR , RULL(0x15012414), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_PPE_XIRAMEDR , RULL(0x10012014), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_PPE_XIRAMEDR , RULL(0x10012014), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_1_PPE_XIRAMEDR , RULL(0x10012414), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_2_PPE_XIRAMEDR , RULL(0x11012014), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_3_PPE_XIRAMEDR , RULL(0x11012414), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_4_PPE_XIRAMEDR , RULL(0x12012014), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_5_PPE_XIRAMEDR , RULL(0x12012414), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_6_PPE_XIRAMEDR , RULL(0x13012014), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_7_PPE_XIRAMEDR , RULL(0x13012414), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_8_PPE_XIRAMEDR , RULL(0x14012014), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_9_PPE_XIRAMEDR , RULL(0x14012414), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_10_PPE_XIRAMEDR , RULL(0x15012014), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_11_PPE_XIRAMEDR , RULL(0x15012414), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_PPE_XIRAMGA , RULL(0x10012412), SH_UNT_EQ , SH_ACS_SCOM_WO ); //DUPS: 10012012, @@ -15594,13 +16124,19 @@ REG64( EQ_4_PPE_XIRAMGA , RULL(0x14012412 SH_ACS_SCOM_WO ); //DUPS: 14012012, REG64( EQ_5_PPE_XIRAMGA , RULL(0x15012412), SH_UNT_EQ_5 , SH_ACS_SCOM_WO ); //DUPS: 15012012, -REG64( EX_PPE_XIRAMGA , RULL(0x10012412), SH_UNT_EX , SH_ACS_SCOM_WO ); -REG64( EX_0_PPE_XIRAMGA , RULL(0x10012412), SH_UNT_EX_0 , SH_ACS_SCOM_WO ); -REG64( EX_2_PPE_XIRAMGA , RULL(0x11012412), SH_UNT_EX_2 , SH_ACS_SCOM_WO ); -REG64( EX_4_PPE_XIRAMGA , RULL(0x12012412), SH_UNT_EX_4 , SH_ACS_SCOM_WO ); -REG64( EX_6_PPE_XIRAMGA , RULL(0x13012412), SH_UNT_EX_6 , SH_ACS_SCOM_WO ); -REG64( EX_8_PPE_XIRAMGA , RULL(0x14012412), SH_UNT_EX_8 , SH_ACS_SCOM_WO ); -REG64( EX_10_PPE_XIRAMGA , RULL(0x15012412), SH_UNT_EX_10 , SH_ACS_SCOM_WO ); +REG64( EX_PPE_XIRAMGA , RULL(0x10012012), SH_UNT_EX , SH_ACS_SCOM_WO ); +REG64( EX_0_PPE_XIRAMGA , RULL(0x10012012), SH_UNT_EX_0 , SH_ACS_SCOM_WO ); +REG64( EX_1_PPE_XIRAMGA , RULL(0x10012412), SH_UNT_EX_1 , SH_ACS_SCOM_WO ); +REG64( EX_2_PPE_XIRAMGA , RULL(0x11012012), SH_UNT_EX_2 , SH_ACS_SCOM_WO ); +REG64( EX_3_PPE_XIRAMGA , RULL(0x11012412), SH_UNT_EX_3 , SH_ACS_SCOM_WO ); +REG64( EX_4_PPE_XIRAMGA , RULL(0x12012012), SH_UNT_EX_4 , SH_ACS_SCOM_WO ); +REG64( EX_5_PPE_XIRAMGA , RULL(0x12012412), SH_UNT_EX_5 , SH_ACS_SCOM_WO ); +REG64( EX_6_PPE_XIRAMGA , RULL(0x13012012), SH_UNT_EX_6 , SH_ACS_SCOM_WO ); +REG64( EX_7_PPE_XIRAMGA , RULL(0x13012412), SH_UNT_EX_7 , SH_ACS_SCOM_WO ); +REG64( EX_8_PPE_XIRAMGA , RULL(0x14012012), SH_UNT_EX_8 , SH_ACS_SCOM_WO ); +REG64( EX_9_PPE_XIRAMGA , RULL(0x14012412), SH_UNT_EX_9 , SH_ACS_SCOM_WO ); +REG64( EX_10_PPE_XIRAMGA , RULL(0x15012012), SH_UNT_EX_10 , SH_ACS_SCOM_WO ); +REG64( EX_11_PPE_XIRAMGA , RULL(0x15012412), SH_UNT_EX_11 , SH_ACS_SCOM_WO ); REG64( EQ_PPE_XIRAMRA , RULL(0x10012411), SH_UNT_EQ , SH_ACS_SCOM_WO ); //DUPS: 10012011, @@ -15616,13 +16152,19 @@ REG64( EQ_4_PPE_XIRAMRA , RULL(0x14012411 SH_ACS_SCOM_WO ); //DUPS: 14012011, REG64( EQ_5_PPE_XIRAMRA , RULL(0x15012411), SH_UNT_EQ_5 , SH_ACS_SCOM_WO ); //DUPS: 15012011, -REG64( EX_PPE_XIRAMRA , RULL(0x10012411), SH_UNT_EX , SH_ACS_SCOM_WO ); -REG64( EX_0_PPE_XIRAMRA , RULL(0x10012411), SH_UNT_EX_0 , SH_ACS_SCOM_WO ); -REG64( EX_2_PPE_XIRAMRA , RULL(0x11012411), SH_UNT_EX_2 , SH_ACS_SCOM_WO ); -REG64( EX_4_PPE_XIRAMRA , RULL(0x12012411), SH_UNT_EX_4 , SH_ACS_SCOM_WO ); -REG64( EX_6_PPE_XIRAMRA , RULL(0x13012411), SH_UNT_EX_6 , SH_ACS_SCOM_WO ); -REG64( EX_8_PPE_XIRAMRA , RULL(0x14012411), SH_UNT_EX_8 , SH_ACS_SCOM_WO ); -REG64( EX_10_PPE_XIRAMRA , RULL(0x15012411), SH_UNT_EX_10 , SH_ACS_SCOM_WO ); +REG64( EX_PPE_XIRAMRA , RULL(0x10012011), SH_UNT_EX , SH_ACS_SCOM_WO ); +REG64( EX_0_PPE_XIRAMRA , RULL(0x10012011), SH_UNT_EX_0 , SH_ACS_SCOM_WO ); +REG64( EX_1_PPE_XIRAMRA , RULL(0x10012411), SH_UNT_EX_1 , SH_ACS_SCOM_WO ); +REG64( EX_2_PPE_XIRAMRA , RULL(0x11012011), SH_UNT_EX_2 , SH_ACS_SCOM_WO ); +REG64( EX_3_PPE_XIRAMRA , RULL(0x11012411), SH_UNT_EX_3 , SH_ACS_SCOM_WO ); +REG64( EX_4_PPE_XIRAMRA , RULL(0x12012011), SH_UNT_EX_4 , SH_ACS_SCOM_WO ); +REG64( EX_5_PPE_XIRAMRA , RULL(0x12012411), SH_UNT_EX_5 , SH_ACS_SCOM_WO ); +REG64( EX_6_PPE_XIRAMRA , RULL(0x13012011), SH_UNT_EX_6 , SH_ACS_SCOM_WO ); +REG64( EX_7_PPE_XIRAMRA , RULL(0x13012411), SH_UNT_EX_7 , SH_ACS_SCOM_WO ); +REG64( EX_8_PPE_XIRAMRA , RULL(0x14012011), SH_UNT_EX_8 , SH_ACS_SCOM_WO ); +REG64( EX_9_PPE_XIRAMRA , RULL(0x14012411), SH_UNT_EX_9 , SH_ACS_SCOM_WO ); +REG64( EX_10_PPE_XIRAMRA , RULL(0x15012011), SH_UNT_EX_10 , SH_ACS_SCOM_WO ); +REG64( EX_11_PPE_XIRAMRA , RULL(0x15012411), SH_UNT_EX_11 , SH_ACS_SCOM_WO ); REG64( EQ_PPE_XIXCR , RULL(0x10012410), SH_UNT_EQ , SH_ACS_SCOM_WO ); //DUPS: 10012010, @@ -15638,13 +16180,19 @@ REG64( EQ_4_PPE_XIXCR , RULL(0x14012410 SH_ACS_SCOM_WO ); //DUPS: 14012010, REG64( EQ_5_PPE_XIXCR , RULL(0x15012410), SH_UNT_EQ_5 , SH_ACS_SCOM_WO ); //DUPS: 15012010, -REG64( EX_PPE_XIXCR , RULL(0x10012410), SH_UNT_EX , SH_ACS_SCOM_WO ); -REG64( EX_0_PPE_XIXCR , RULL(0x10012410), SH_UNT_EX_0 , SH_ACS_SCOM_WO ); -REG64( EX_2_PPE_XIXCR , RULL(0x11012410), SH_UNT_EX_2 , SH_ACS_SCOM_WO ); -REG64( EX_4_PPE_XIXCR , RULL(0x12012410), SH_UNT_EX_4 , SH_ACS_SCOM_WO ); -REG64( EX_6_PPE_XIXCR , RULL(0x13012410), SH_UNT_EX_6 , SH_ACS_SCOM_WO ); -REG64( EX_8_PPE_XIXCR , RULL(0x14012410), SH_UNT_EX_8 , SH_ACS_SCOM_WO ); -REG64( EX_10_PPE_XIXCR , RULL(0x15012410), SH_UNT_EX_10 , SH_ACS_SCOM_WO ); +REG64( EX_PPE_XIXCR , RULL(0x10012010), SH_UNT_EX , SH_ACS_SCOM_WO ); +REG64( EX_0_PPE_XIXCR , RULL(0x10012010), SH_UNT_EX_0 , SH_ACS_SCOM_WO ); +REG64( EX_1_PPE_XIXCR , RULL(0x10012410), SH_UNT_EX_1 , SH_ACS_SCOM_WO ); +REG64( EX_2_PPE_XIXCR , RULL(0x11012010), SH_UNT_EX_2 , SH_ACS_SCOM_WO ); +REG64( EX_3_PPE_XIXCR , RULL(0x11012410), SH_UNT_EX_3 , SH_ACS_SCOM_WO ); +REG64( EX_4_PPE_XIXCR , RULL(0x12012010), SH_UNT_EX_4 , SH_ACS_SCOM_WO ); +REG64( EX_5_PPE_XIXCR , RULL(0x12012410), SH_UNT_EX_5 , SH_ACS_SCOM_WO ); +REG64( EX_6_PPE_XIXCR , RULL(0x13012010), SH_UNT_EX_6 , SH_ACS_SCOM_WO ); +REG64( EX_7_PPE_XIXCR , RULL(0x13012410), SH_UNT_EX_7 , SH_ACS_SCOM_WO ); +REG64( EX_8_PPE_XIXCR , RULL(0x14012010), SH_UNT_EX_8 , SH_ACS_SCOM_WO ); +REG64( EX_9_PPE_XIXCR , RULL(0x14012410), SH_UNT_EX_9 , SH_ACS_SCOM_WO ); +REG64( EX_10_PPE_XIXCR , RULL(0x15012010), SH_UNT_EX_10 , SH_ACS_SCOM_WO ); +REG64( EX_11_PPE_XIXCR , RULL(0x15012410), SH_UNT_EX_11 , SH_ACS_SCOM_WO ); REG64( C_PPM_CGCR , RULL(0x200F0164), SH_UNT_C , SH_ACS_SCOM_RW ); REG64( C_0_PPM_CGCR , RULL(0x200F0164), SH_UNT_C_0 , SH_ACS_SCOM_RW ); @@ -21855,12 +22403,13 @@ REG64( EQ_2_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x12012800 REG64( EQ_3_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x13012800), SH_UNT_EQ_3 , SH_ACS_SCOM_RO ); REG64( EQ_4_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x14012800), SH_UNT_EQ_4 , SH_ACS_SCOM_RO ); REG64( EQ_5_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x15012800), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); -REG64( EX_1_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x10012800), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); -REG64( EX_3_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x11012800), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); -REG64( EX_5_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x12012800), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); -REG64( EX_7_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x13012800), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); -REG64( EX_9_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x14012800), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); -REG64( EX_11_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x15012800), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); +REG64( EX_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x10012800), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_0_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x10012800), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_2_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x11012800), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_4_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x12012800), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_6_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x13012800), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_8_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x14012800), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_10_TPLC20_TR0_TRACE_HI_DATA_REG , RULL(0x15012800), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EQ_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x10012801), SH_UNT_EQ , SH_ACS_SCOM_RO ); REG64( EQ_0_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x10012801), SH_UNT_EQ_0 , SH_ACS_SCOM_RO ); @@ -21869,12 +22418,13 @@ REG64( EQ_2_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x12012801 REG64( EQ_3_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x13012801), SH_UNT_EQ_3 , SH_ACS_SCOM_RO ); REG64( EQ_4_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x14012801), SH_UNT_EQ_4 , SH_ACS_SCOM_RO ); REG64( EQ_5_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x15012801), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); -REG64( EX_1_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x10012801), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); -REG64( EX_3_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x11012801), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); -REG64( EX_5_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x12012801), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); -REG64( EX_7_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x13012801), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); -REG64( EX_9_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x14012801), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); -REG64( EX_11_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x15012801), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); +REG64( EX_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x10012801), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_0_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x10012801), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_2_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x11012801), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_4_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x12012801), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_6_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x13012801), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_8_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x14012801), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_10_TPLC20_TR0_TRACE_LO_DATA_REG , RULL(0x15012801), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EQ_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x10012802), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x10012802), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -21883,12 +22433,13 @@ REG64( EQ_2_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x12012802 REG64( EQ_3_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x13012802), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x14012802), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x15012802), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x10012802), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x11012802), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x12012802), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x13012802), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x14012802), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x15012802), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x10012802), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x10012802), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x11012802), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x12012802), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x13012802), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x14012802), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR0_TRACE_TRCTRL_CONFIG , RULL(0x15012802), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x10012803), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x10012803), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -21897,12 +22448,13 @@ REG64( EQ_2_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x12012803 REG64( EQ_3_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x13012803), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x14012803), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x15012803), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x10012803), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x11012803), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x12012803), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x13012803), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x14012803), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x15012803), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x10012803), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x10012803), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x11012803), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x12012803), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x13012803), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x14012803), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x15012803), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x10012804), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x10012804), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -21911,12 +22463,13 @@ REG64( EQ_2_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x12012804 REG64( EQ_3_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x13012804), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x14012804), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x15012804), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x10012804), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x11012804), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x12012804), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x13012804), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x14012804), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x15012804), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x10012804), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x10012804), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x11012804), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x12012804), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x13012804), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x14012804), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x15012804), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x10012805), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x10012805), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -21925,12 +22478,13 @@ REG64( EQ_2_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x12012805 REG64( EQ_3_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x13012805), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x14012805), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x15012805), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x10012805), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x11012805), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x12012805), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x13012805), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x14012805), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x15012805), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x10012805), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x10012805), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x11012805), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x12012805), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x13012805), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x14012805), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x15012805), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x10012806), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x10012806), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -21939,12 +22493,13 @@ REG64( EQ_2_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x12012806 REG64( EQ_3_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x13012806), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x14012806), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x15012806), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x10012806), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x11012806), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x12012806), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x13012806), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x14012806), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x15012806), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x10012806), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x10012806), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x11012806), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x12012806), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x13012806), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x14012806), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x15012806), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x10012807), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x10012807), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -21953,12 +22508,13 @@ REG64( EQ_2_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x12012807 REG64( EQ_3_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x13012807), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x14012807), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x15012807), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x10012807), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x11012807), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x12012807), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x13012807), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x14012807), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x15012807), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x10012807), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x10012807), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x11012807), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x12012807), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x13012807), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x14012807), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x15012807), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x10012808), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x10012808), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -21967,12 +22523,13 @@ REG64( EQ_2_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x12012808 REG64( EQ_3_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x13012808), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x14012808), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x15012808), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x10012808), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x11012808), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x12012808), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x13012808), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x14012808), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x15012808), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x10012808), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x10012808), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x11012808), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x12012808), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x13012808), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x14012808), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x15012808), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x10012809), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x10012809), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -21981,12 +22538,13 @@ REG64( EQ_2_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x12012809 REG64( EQ_3_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x13012809), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x14012809), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x15012809), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x10012809), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x11012809), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x12012809), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x13012809), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x14012809), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x15012809), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x10012809), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x10012809), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x11012809), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x12012809), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x13012809), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x14012809), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x15012809), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x10012840), SH_UNT_EQ , SH_ACS_SCOM_RO ); REG64( EQ_0_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x10012840), SH_UNT_EQ_0 , SH_ACS_SCOM_RO ); @@ -21995,12 +22553,13 @@ REG64( EQ_2_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x12012840 REG64( EQ_3_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x13012840), SH_UNT_EQ_3 , SH_ACS_SCOM_RO ); REG64( EQ_4_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x14012840), SH_UNT_EQ_4 , SH_ACS_SCOM_RO ); REG64( EQ_5_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x15012840), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); -REG64( EX_1_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x10012840), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); -REG64( EX_3_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x11012840), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); -REG64( EX_5_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x12012840), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); -REG64( EX_7_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x13012840), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); -REG64( EX_9_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x14012840), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); -REG64( EX_11_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x15012840), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); +REG64( EX_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x10012840), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_0_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x10012840), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_2_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x11012840), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_4_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x12012840), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_6_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x13012840), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_8_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x14012840), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_10_TPLC20_TR1_TRACE_HI_DATA_REG , RULL(0x15012840), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EQ_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x10012841), SH_UNT_EQ , SH_ACS_SCOM_RO ); REG64( EQ_0_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x10012841), SH_UNT_EQ_0 , SH_ACS_SCOM_RO ); @@ -22009,12 +22568,13 @@ REG64( EQ_2_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x12012841 REG64( EQ_3_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x13012841), SH_UNT_EQ_3 , SH_ACS_SCOM_RO ); REG64( EQ_4_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x14012841), SH_UNT_EQ_4 , SH_ACS_SCOM_RO ); REG64( EQ_5_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x15012841), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); -REG64( EX_1_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x10012841), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); -REG64( EX_3_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x11012841), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); -REG64( EX_5_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x12012841), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); -REG64( EX_7_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x13012841), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); -REG64( EX_9_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x14012841), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); -REG64( EX_11_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x15012841), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); +REG64( EX_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x10012841), SH_UNT_EX , SH_ACS_SCOM_RO ); +REG64( EX_0_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x10012841), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); +REG64( EX_2_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x11012841), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); +REG64( EX_4_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x12012841), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); +REG64( EX_6_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x13012841), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); +REG64( EX_8_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x14012841), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); +REG64( EX_10_TPLC20_TR1_TRACE_LO_DATA_REG , RULL(0x15012841), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); REG64( EQ_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x10012842), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x10012842), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22023,12 +22583,13 @@ REG64( EQ_2_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x12012842 REG64( EQ_3_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x13012842), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x14012842), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x15012842), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x10012842), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x11012842), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x12012842), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x13012842), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x14012842), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x15012842), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x10012842), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x10012842), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x11012842), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x12012842), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x13012842), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x14012842), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR1_TRACE_TRCTRL_CONFIG , RULL(0x15012842), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x10012843), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x10012843), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22037,12 +22598,13 @@ REG64( EQ_2_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x12012843 REG64( EQ_3_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x13012843), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x14012843), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x15012843), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x10012843), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x11012843), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x12012843), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x13012843), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x14012843), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x15012843), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x10012843), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x10012843), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x11012843), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x12012843), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x13012843), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x14012843), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x15012843), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x10012844), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x10012844), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22051,12 +22613,13 @@ REG64( EQ_2_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x12012844 REG64( EQ_3_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x13012844), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x14012844), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x15012844), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x10012844), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x11012844), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x12012844), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x13012844), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x14012844), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x15012844), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x10012844), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x10012844), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x11012844), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x12012844), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x13012844), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x14012844), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x15012844), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x10012845), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x10012845), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22065,12 +22628,13 @@ REG64( EQ_2_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x12012845 REG64( EQ_3_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x13012845), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x14012845), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x15012845), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x10012845), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x11012845), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x12012845), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x13012845), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x14012845), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x15012845), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x10012845), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x10012845), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x11012845), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x12012845), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x13012845), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x14012845), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x15012845), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x10012846), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x10012846), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22079,12 +22643,13 @@ REG64( EQ_2_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x12012846 REG64( EQ_3_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x13012846), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x14012846), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x15012846), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x10012846), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x11012846), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x12012846), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x13012846), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x14012846), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x15012846), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x10012846), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x10012846), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x11012846), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x12012846), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x13012846), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x14012846), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x15012846), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x10012847), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x10012847), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22093,12 +22658,13 @@ REG64( EQ_2_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x12012847 REG64( EQ_3_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x13012847), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x14012847), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x15012847), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x10012847), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x11012847), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x12012847), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x13012847), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x14012847), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x15012847), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x10012847), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x10012847), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x11012847), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x12012847), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x13012847), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x14012847), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x15012847), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x10012848), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x10012848), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22107,12 +22673,13 @@ REG64( EQ_2_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x12012848 REG64( EQ_3_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x13012848), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x14012848), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x15012848), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x10012848), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x11012848), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x12012848), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x13012848), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x14012848), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x15012848), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x10012848), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x10012848), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x11012848), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x12012848), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x13012848), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x14012848), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x15012848), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x10012849), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x10012849), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22121,12 +22688,13 @@ REG64( EQ_2_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x12012849 REG64( EQ_3_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x13012849), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x14012849), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x15012849), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_1_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x10012849), SH_UNT_EX_1 , SH_ACS_SCOM ); -REG64( EX_3_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x11012849), SH_UNT_EX_3 , SH_ACS_SCOM ); -REG64( EX_5_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x12012849), SH_UNT_EX_5 , SH_ACS_SCOM ); -REG64( EX_7_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x13012849), SH_UNT_EX_7 , SH_ACS_SCOM ); -REG64( EX_9_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x14012849), SH_UNT_EX_9 , SH_ACS_SCOM ); -REG64( EX_11_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x15012849), SH_UNT_EX_11 , SH_ACS_SCOM ); +REG64( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x10012849), SH_UNT_EX , SH_ACS_SCOM ); +REG64( EX_0_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x10012849), SH_UNT_EX_0 , SH_ACS_SCOM ); +REG64( EX_2_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x11012849), SH_UNT_EX_2 , SH_ACS_SCOM ); +REG64( EX_4_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x12012849), SH_UNT_EX_4 , SH_ACS_SCOM ); +REG64( EX_6_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x13012849), SH_UNT_EX_6 , SH_ACS_SCOM ); +REG64( EX_8_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x14012849), SH_UNT_EX_8 , SH_ACS_SCOM ); +REG64( EX_10_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x15012849), SH_UNT_EX_10 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x10012C00), SH_UNT_EQ , SH_ACS_SCOM_RO ); REG64( EQ_0_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x10012C00), SH_UNT_EQ_0 , SH_ACS_SCOM_RO ); @@ -22135,13 +22703,12 @@ REG64( EQ_2_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x12012C00 REG64( EQ_3_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x13012C00), SH_UNT_EQ_3 , SH_ACS_SCOM_RO ); REG64( EQ_4_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x14012C00), SH_UNT_EQ_4 , SH_ACS_SCOM_RO ); REG64( EQ_5_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x15012C00), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); -REG64( EX_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x10012C00), SH_UNT_EX , SH_ACS_SCOM_RO ); -REG64( EX_0_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x10012C00), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); -REG64( EX_2_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x11012C00), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); -REG64( EX_4_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x12012C00), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); -REG64( EX_6_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x13012C00), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); -REG64( EX_8_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x14012C00), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); -REG64( EX_10_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x15012C00), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_1_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x10012C00), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); +REG64( EX_3_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x11012C00), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); +REG64( EX_5_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x12012C00), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); +REG64( EX_7_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x13012C00), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); +REG64( EX_9_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x14012C00), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); +REG64( EX_11_TPLC21_TR0_TRACE_HI_DATA_REG , RULL(0x15012C00), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x10012C01), SH_UNT_EQ , SH_ACS_SCOM_RO ); REG64( EQ_0_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x10012C01), SH_UNT_EQ_0 , SH_ACS_SCOM_RO ); @@ -22150,13 +22717,12 @@ REG64( EQ_2_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x12012C01 REG64( EQ_3_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x13012C01), SH_UNT_EQ_3 , SH_ACS_SCOM_RO ); REG64( EQ_4_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x14012C01), SH_UNT_EQ_4 , SH_ACS_SCOM_RO ); REG64( EQ_5_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x15012C01), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); -REG64( EX_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x10012C01), SH_UNT_EX , SH_ACS_SCOM_RO ); -REG64( EX_0_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x10012C01), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); -REG64( EX_2_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x11012C01), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); -REG64( EX_4_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x12012C01), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); -REG64( EX_6_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x13012C01), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); -REG64( EX_8_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x14012C01), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); -REG64( EX_10_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x15012C01), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_1_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x10012C01), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); +REG64( EX_3_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x11012C01), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); +REG64( EX_5_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x12012C01), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); +REG64( EX_7_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x13012C01), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); +REG64( EX_9_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x14012C01), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); +REG64( EX_11_TPLC21_TR0_TRACE_LO_DATA_REG , RULL(0x15012C01), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x10012C02), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x10012C02), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22165,13 +22731,12 @@ REG64( EQ_2_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x12012C02 REG64( EQ_3_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x13012C02), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x14012C02), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x15012C02), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x10012C02), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x10012C02), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x11012C02), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x12012C02), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x13012C02), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x14012C02), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x15012C02), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x10012C02), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x11012C02), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x12012C02), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x13012C02), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x14012C02), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR0_TRACE_TRCTRL_CONFIG , RULL(0x15012C02), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x10012C03), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x10012C03), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22180,13 +22745,12 @@ REG64( EQ_2_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x12012C03 REG64( EQ_3_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x13012C03), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x14012C03), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x15012C03), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x10012C03), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x10012C03), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x11012C03), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x12012C03), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x13012C03), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x14012C03), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x15012C03), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x10012C03), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x11012C03), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x12012C03), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x13012C03), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x14012C03), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 , RULL(0x15012C03), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x10012C04), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x10012C04), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22195,13 +22759,12 @@ REG64( EQ_2_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x12012C04 REG64( EQ_3_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x13012C04), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x14012C04), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x15012C04), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x10012C04), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x10012C04), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x11012C04), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x12012C04), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x13012C04), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x14012C04), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x15012C04), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x10012C04), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x11012C04), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x12012C04), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x13012C04), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x14012C04), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 , RULL(0x15012C04), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x10012C05), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x10012C05), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22210,13 +22773,12 @@ REG64( EQ_2_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x12012C05 REG64( EQ_3_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x13012C05), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x14012C05), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x15012C05), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x10012C05), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x10012C05), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x11012C05), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x12012C05), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x13012C05), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x14012C05), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x15012C05), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x10012C05), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x11012C05), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x12012C05), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x13012C05), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x14012C05), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 , RULL(0x15012C05), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x10012C06), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x10012C06), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22225,13 +22787,12 @@ REG64( EQ_2_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x12012C06 REG64( EQ_3_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x13012C06), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x14012C06), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x15012C06), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x10012C06), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x10012C06), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x11012C06), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x12012C06), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x13012C06), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x14012C06), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x15012C06), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x10012C06), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x11012C06), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x12012C06), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x13012C06), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x14012C06), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 , RULL(0x15012C06), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x10012C07), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x10012C07), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22240,13 +22801,12 @@ REG64( EQ_2_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x12012C07 REG64( EQ_3_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x13012C07), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x14012C07), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x15012C07), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x10012C07), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x10012C07), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x11012C07), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x12012C07), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x13012C07), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x14012C07), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x15012C07), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x10012C07), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x11012C07), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x12012C07), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x13012C07), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x14012C07), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 , RULL(0x15012C07), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x10012C08), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x10012C08), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22255,13 +22815,12 @@ REG64( EQ_2_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x12012C08 REG64( EQ_3_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x13012C08), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x14012C08), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x15012C08), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x10012C08), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x10012C08), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x11012C08), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x12012C08), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x13012C08), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x14012C08), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x15012C08), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x10012C08), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x11012C08), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x12012C08), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x13012C08), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x14012C08), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 , RULL(0x15012C08), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x10012C09), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x10012C09), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22270,13 +22829,12 @@ REG64( EQ_2_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x12012C09 REG64( EQ_3_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x13012C09), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x14012C09), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x15012C09), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x10012C09), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x10012C09), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x11012C09), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x12012C09), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x13012C09), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x14012C09), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x15012C09), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x10012C09), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x11012C09), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x12012C09), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x13012C09), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x14012C09), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 , RULL(0x15012C09), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x10012C40), SH_UNT_EQ , SH_ACS_SCOM_RO ); REG64( EQ_0_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x10012C40), SH_UNT_EQ_0 , SH_ACS_SCOM_RO ); @@ -22285,13 +22843,12 @@ REG64( EQ_2_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x12012C40 REG64( EQ_3_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x13012C40), SH_UNT_EQ_3 , SH_ACS_SCOM_RO ); REG64( EQ_4_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x14012C40), SH_UNT_EQ_4 , SH_ACS_SCOM_RO ); REG64( EQ_5_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x15012C40), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); -REG64( EX_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x10012C40), SH_UNT_EX , SH_ACS_SCOM_RO ); -REG64( EX_0_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x10012C40), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); -REG64( EX_2_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x11012C40), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); -REG64( EX_4_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x12012C40), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); -REG64( EX_6_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x13012C40), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); -REG64( EX_8_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x14012C40), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); -REG64( EX_10_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x15012C40), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_1_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x10012C40), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); +REG64( EX_3_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x11012C40), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); +REG64( EX_5_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x12012C40), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); +REG64( EX_7_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x13012C40), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); +REG64( EX_9_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x14012C40), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); +REG64( EX_11_TPLC21_TR1_TRACE_HI_DATA_REG , RULL(0x15012C40), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x10012C41), SH_UNT_EQ , SH_ACS_SCOM_RO ); REG64( EQ_0_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x10012C41), SH_UNT_EQ_0 , SH_ACS_SCOM_RO ); @@ -22300,13 +22857,12 @@ REG64( EQ_2_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x12012C41 REG64( EQ_3_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x13012C41), SH_UNT_EQ_3 , SH_ACS_SCOM_RO ); REG64( EQ_4_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x14012C41), SH_UNT_EQ_4 , SH_ACS_SCOM_RO ); REG64( EQ_5_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x15012C41), SH_UNT_EQ_5 , SH_ACS_SCOM_RO ); -REG64( EX_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x10012C41), SH_UNT_EX , SH_ACS_SCOM_RO ); -REG64( EX_0_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x10012C41), SH_UNT_EX_0 , SH_ACS_SCOM_RO ); -REG64( EX_2_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x11012C41), SH_UNT_EX_2 , SH_ACS_SCOM_RO ); -REG64( EX_4_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x12012C41), SH_UNT_EX_4 , SH_ACS_SCOM_RO ); -REG64( EX_6_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x13012C41), SH_UNT_EX_6 , SH_ACS_SCOM_RO ); -REG64( EX_8_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x14012C41), SH_UNT_EX_8 , SH_ACS_SCOM_RO ); -REG64( EX_10_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x15012C41), SH_UNT_EX_10 , SH_ACS_SCOM_RO ); +REG64( EX_1_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x10012C41), SH_UNT_EX_1 , SH_ACS_SCOM_RO ); +REG64( EX_3_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x11012C41), SH_UNT_EX_3 , SH_ACS_SCOM_RO ); +REG64( EX_5_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x12012C41), SH_UNT_EX_5 , SH_ACS_SCOM_RO ); +REG64( EX_7_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x13012C41), SH_UNT_EX_7 , SH_ACS_SCOM_RO ); +REG64( EX_9_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x14012C41), SH_UNT_EX_9 , SH_ACS_SCOM_RO ); +REG64( EX_11_TPLC21_TR1_TRACE_LO_DATA_REG , RULL(0x15012C41), SH_UNT_EX_11 , SH_ACS_SCOM_RO ); REG64( EQ_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x10012C42), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x10012C42), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22315,13 +22871,12 @@ REG64( EQ_2_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x12012C42 REG64( EQ_3_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x13012C42), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x14012C42), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x15012C42), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x10012C42), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x10012C42), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x11012C42), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x12012C42), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x13012C42), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x14012C42), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x15012C42), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x10012C42), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x11012C42), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x12012C42), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x13012C42), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x14012C42), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR1_TRACE_TRCTRL_CONFIG , RULL(0x15012C42), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x10012C43), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x10012C43), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22330,13 +22885,12 @@ REG64( EQ_2_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x12012C43 REG64( EQ_3_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x13012C43), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x14012C43), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x15012C43), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x10012C43), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x10012C43), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x11012C43), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x12012C43), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x13012C43), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x14012C43), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x15012C43), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x10012C43), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x11012C43), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x12012C43), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x13012C43), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x14012C43), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 , RULL(0x15012C43), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x10012C44), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x10012C44), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22345,13 +22899,12 @@ REG64( EQ_2_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x12012C44 REG64( EQ_3_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x13012C44), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x14012C44), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x15012C44), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x10012C44), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x10012C44), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x11012C44), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x12012C44), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x13012C44), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x14012C44), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x15012C44), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x10012C44), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x11012C44), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x12012C44), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x13012C44), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x14012C44), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 , RULL(0x15012C44), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x10012C45), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x10012C45), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22360,13 +22913,12 @@ REG64( EQ_2_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x12012C45 REG64( EQ_3_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x13012C45), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x14012C45), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x15012C45), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x10012C45), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x10012C45), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x11012C45), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x12012C45), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x13012C45), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x14012C45), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x15012C45), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x10012C45), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x11012C45), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x12012C45), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x13012C45), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x14012C45), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 , RULL(0x15012C45), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x10012C46), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x10012C46), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22375,13 +22927,12 @@ REG64( EQ_2_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x12012C46 REG64( EQ_3_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x13012C46), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x14012C46), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x15012C46), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x10012C46), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x10012C46), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x11012C46), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x12012C46), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x13012C46), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x14012C46), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x15012C46), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x10012C46), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x11012C46), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x12012C46), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x13012C46), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x14012C46), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 , RULL(0x15012C46), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x10012C47), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x10012C47), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22390,13 +22941,12 @@ REG64( EQ_2_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x12012C47 REG64( EQ_3_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x13012C47), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x14012C47), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x15012C47), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x10012C47), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x10012C47), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x11012C47), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x12012C47), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x13012C47), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x14012C47), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x15012C47), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x10012C47), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x11012C47), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x12012C47), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x13012C47), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x14012C47), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 , RULL(0x15012C47), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x10012C48), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x10012C48), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22405,13 +22955,12 @@ REG64( EQ_2_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x12012C48 REG64( EQ_3_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x13012C48), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x14012C48), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x15012C48), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x10012C48), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x10012C48), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x11012C48), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x12012C48), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x13012C48), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x14012C48), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x15012C48), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x10012C48), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x11012C48), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x12012C48), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x13012C48), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x14012C48), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 , RULL(0x15012C48), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x10012C49), SH_UNT_EQ , SH_ACS_SCOM ); REG64( EQ_0_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x10012C49), SH_UNT_EQ_0 , SH_ACS_SCOM ); @@ -22420,13 +22969,12 @@ REG64( EQ_2_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x12012C49 REG64( EQ_3_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x13012C49), SH_UNT_EQ_3 , SH_ACS_SCOM ); REG64( EQ_4_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x14012C49), SH_UNT_EQ_4 , SH_ACS_SCOM ); REG64( EQ_5_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x15012C49), SH_UNT_EQ_5 , SH_ACS_SCOM ); -REG64( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x10012C49), SH_UNT_EX , SH_ACS_SCOM ); -REG64( EX_0_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x10012C49), SH_UNT_EX_0 , SH_ACS_SCOM ); -REG64( EX_2_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x11012C49), SH_UNT_EX_2 , SH_ACS_SCOM ); -REG64( EX_4_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x12012C49), SH_UNT_EX_4 , SH_ACS_SCOM ); -REG64( EX_6_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x13012C49), SH_UNT_EX_6 , SH_ACS_SCOM ); -REG64( EX_8_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x14012C49), SH_UNT_EX_8 , SH_ACS_SCOM ); -REG64( EX_10_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x15012C49), SH_UNT_EX_10 , SH_ACS_SCOM ); +REG64( EX_1_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x10012C49), SH_UNT_EX_1 , SH_ACS_SCOM ); +REG64( EX_3_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x11012C49), SH_UNT_EX_3 , SH_ACS_SCOM ); +REG64( EX_5_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x12012C49), SH_UNT_EX_5 , SH_ACS_SCOM ); +REG64( EX_7_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x13012C49), SH_UNT_EX_7 , SH_ACS_SCOM ); +REG64( EX_9_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x14012C49), SH_UNT_EX_9 , SH_ACS_SCOM ); +REG64( EX_11_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 , RULL(0x15012C49), SH_UNT_EX_11 , SH_ACS_SCOM ); REG64( C_V0_HMER_WAND , RULL(0x20010A92), SH_UNT_C , SH_ACS_SCOM1_WAND ); diff --git a/import/chips/p9/common/include/p9_quad_scom_addresses_fld.H b/import/chips/p9/common/include/p9_quad_scom_addresses_fld.H index b9331b96..c28408d3 100644 --- a/import/chips/p9/common/include/p9_quad_scom_addresses_fld.H +++ b/import/chips/p9/common/include/p9_quad_scom_addresses_fld.H @@ -7672,70 +7672,37 @@ REG64_FLD( EQ_HTM_CTRL_HTMSC_SPARE1415 , 14 , SH_UN REG64_FLD( EQ_HTM_CTRL_HTMSC_SPARE1415_LEN , 2 , SH_UNT_EQ , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SPARE1415_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_TRIG , 0 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_TRIG , 0 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_TRIG ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_TRIG_LEN , 2 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_TRIG_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_TRIG_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_MTSPR_TRIG , 2 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_MTSPR_TRIG , 2 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_MTSPR_TRIG ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_MTSPR_MARK , 3 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_MTSPR_MARK , 3 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_MTSPR_MARK ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_MARK , 4 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_MARK , 4 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_MARK ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_MARK_LEN , 2 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_MARK_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_MARK_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_DBG0_STOP , 6 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_DBG0_STOP , 6 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_DBG0_STOP ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_DBG1_STOP , 7 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_DBG1_STOP , 7 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_DBG1_STOP ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_RUN_STOP , 8 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_RUN_STOP , 8 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_RUN_STOP ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_CHIP0_STOP , 9 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_CHIP0_STOP , 9 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_CHIP0_STOP ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_CHIP1_STOP , 10 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_CHIP1_STOP , 10 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_CHIP1_STOP ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_SPARE1112 , 11 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_SPARE1112 , 11 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SPARE1112 ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_SPARE1112_LEN , 2 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_SPARE1112_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SPARE1112_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_XSTOP_STOP , 13 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_XSTOP_STOP , 13 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_XSTOP_STOP ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_SPARE1415 , 14 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_SPARE1415 , 14 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SPARE1415 ); -REG64_FLD( EX_CHTMLBS0_HTM_CTRL_HTMSC_SPARE1415_LEN , 2 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SPARE1415_LEN ); - -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_TRIG , 0 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_TRIG ); -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_TRIG_LEN , 2 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_TRIG_LEN ); -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_MTSPR_TRIG , 2 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_MTSPR_TRIG ); -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_MTSPR_MARK , 3 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_MTSPR_MARK ); -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_MARK , 4 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_MARK ); -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_MARK_LEN , 2 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_MARK_LEN ); -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_DBG0_STOP , 6 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_DBG0_STOP ); -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_DBG1_STOP , 7 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_DBG1_STOP ); -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_RUN_STOP , 8 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_RUN_STOP ); -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_CHIP0_STOP , 9 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_CHIP0_STOP ); -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_CHIP1_STOP , 10 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_CHIP1_STOP ); -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_SPARE1112 , 11 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SPARE1112 ); -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_SPARE1112_LEN , 2 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SPARE1112_LEN ); -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_XSTOP_STOP , 13 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_XSTOP_STOP ); -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_SPARE1415 , 14 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SPARE1415 ); -REG64_FLD( EX_CHTMLBS1_HTM_CTRL_HTMSC_SPARE1415_LEN , 2 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_CTRL_HTMSC_SPARE1415_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SPARE1415_LEN ); REG64_FLD( EQ_HTM_IMA_PDBAR_HTMSC_ENABLE_SPLIT_CORE , 1 , SH_UNT_EQ , SH_ACS_SCOM_RW , @@ -7753,34 +7720,19 @@ REG64_FLD( EQ_HTM_IMA_PDBAR_HTMSC , 8 , SH_UN REG64_FLD( EQ_HTM_IMA_PDBAR_HTMSC_LEN , 43 , SH_UNT_EQ , SH_ACS_SCOM_RW , SH_FLD_HTMSC_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_PDBAR_HTMSC_ENABLE_SPLIT_CORE , 1 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_ENABLE_SPLIT_CORE ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_PDBAR_HTMSC_SPARE2TO4 , 2 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SPARE2TO4 ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_PDBAR_HTMSC_SPARE2TO4_LEN , 3 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SPARE2TO4_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_PDBAR_HTMSC_SCOPE , 5 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SCOPE ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_PDBAR_HTMSC_SCOPE_LEN , 3 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SCOPE_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_PDBAR_HTMSC , 8 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_PDBAR_HTMSC_LEN , 43 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_LEN ); - -REG64_FLD( EX_CHTMLBS1_HTM_IMA_PDBAR_HTMSC_ENABLE_SPLIT_CORE , 1 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_IMA_PDBAR_HTMSC_ENABLE_SPLIT_CORE , 1 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_ENABLE_SPLIT_CORE ); -REG64_FLD( EX_CHTMLBS1_HTM_IMA_PDBAR_HTMSC_SPARE2TO4 , 2 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_IMA_PDBAR_HTMSC_SPARE2TO4 , 2 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SPARE2TO4 ); -REG64_FLD( EX_CHTMLBS1_HTM_IMA_PDBAR_HTMSC_SPARE2TO4_LEN , 3 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_IMA_PDBAR_HTMSC_SPARE2TO4_LEN , 3 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SPARE2TO4_LEN ); -REG64_FLD( EX_CHTMLBS1_HTM_IMA_PDBAR_HTMSC_SCOPE , 5 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_IMA_PDBAR_HTMSC_SCOPE , 5 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SCOPE ); -REG64_FLD( EX_CHTMLBS1_HTM_IMA_PDBAR_HTMSC_SCOPE_LEN , 3 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_IMA_PDBAR_HTMSC_SCOPE_LEN , 3 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SCOPE_LEN ); -REG64_FLD( EX_CHTMLBS1_HTM_IMA_PDBAR_HTMSC , 8 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_IMA_PDBAR_HTMSC , 8 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC ); -REG64_FLD( EX_CHTMLBS1_HTM_IMA_PDBAR_HTMSC_LEN , 43 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_IMA_PDBAR_HTMSC_LEN , 43 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_LEN ); REG64_FLD( EQ_HTM_IMA_STATUS_HTMSC_ERROR , 0 , SH_UNT_EQ , SH_ACS_SCOM_RO , @@ -7802,42 +7754,23 @@ REG64_FLD( EQ_HTM_IMA_STATUS_HTMSC_COUNT , 12 , SH_UN REG64_FLD( EQ_HTM_IMA_STATUS_HTMSC_COUNT_LEN , 4 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_HTMSC_COUNT_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_STATUS_HTMSC_ERROR , 0 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , - SH_FLD_HTMSC_ERROR ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_STATUS_HTMSC_TRACE_ACTIVE , 1 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , - SH_FLD_HTMSC_TRACE_ACTIVE ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_STATUS_HTMSC_PDBAR_ERROR , 2 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , - SH_FLD_HTMSC_PDBAR_ERROR ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_STATUS_HTMSC_RESERVED , 3 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , - SH_FLD_HTMSC_RESERVED ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_STATUS_HTMSC_RESERVED_LEN , 2 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , - SH_FLD_HTMSC_RESERVED_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_STATUS_HTMSC_FSM , 5 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , - SH_FLD_HTMSC_FSM ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_STATUS_HTMSC_FSM_LEN , 7 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , - SH_FLD_HTMSC_FSM_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_STATUS_HTMSC_COUNT , 12 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , - SH_FLD_HTMSC_COUNT ); -REG64_FLD( EX_CHTMLBS0_HTM_IMA_STATUS_HTMSC_COUNT_LEN , 4 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , - SH_FLD_HTMSC_COUNT_LEN ); - -REG64_FLD( EX_CHTMLBS1_HTM_IMA_STATUS_HTMSC_ERROR , 0 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_IMA_STATUS_HTMSC_ERROR , 0 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMSC_ERROR ); -REG64_FLD( EX_CHTMLBS1_HTM_IMA_STATUS_HTMSC_TRACE_ACTIVE , 1 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_IMA_STATUS_HTMSC_TRACE_ACTIVE , 1 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMSC_TRACE_ACTIVE ); -REG64_FLD( EX_CHTMLBS1_HTM_IMA_STATUS_HTMSC_PDBAR_ERROR , 2 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_IMA_STATUS_HTMSC_PDBAR_ERROR , 2 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMSC_PDBAR_ERROR ); -REG64_FLD( EX_CHTMLBS1_HTM_IMA_STATUS_HTMSC_RESERVED , 3 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_IMA_STATUS_HTMSC_RESERVED , 3 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMSC_RESERVED ); -REG64_FLD( EX_CHTMLBS1_HTM_IMA_STATUS_HTMSC_RESERVED_LEN , 2 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_IMA_STATUS_HTMSC_RESERVED_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMSC_RESERVED_LEN ); -REG64_FLD( EX_CHTMLBS1_HTM_IMA_STATUS_HTMSC_FSM , 5 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_IMA_STATUS_HTMSC_FSM , 5 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMSC_FSM ); -REG64_FLD( EX_CHTMLBS1_HTM_IMA_STATUS_HTMSC_FSM_LEN , 7 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_IMA_STATUS_HTMSC_FSM_LEN , 7 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMSC_FSM_LEN ); -REG64_FLD( EX_CHTMLBS1_HTM_IMA_STATUS_HTMSC_COUNT , 12 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_IMA_STATUS_HTMSC_COUNT , 12 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMSC_COUNT ); -REG64_FLD( EX_CHTMLBS1_HTM_IMA_STATUS_HTMSC_COUNT_LEN , 4 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_IMA_STATUS_HTMSC_COUNT_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMSC_COUNT_LEN ); REG64_FLD( EQ_HTM_LAST_ADDRESS , 8 , SH_UNT_EQ , SH_ACS_SCOM_RO , @@ -7845,14 +7778,9 @@ REG64_FLD( EQ_HTM_LAST_ADDRESS , 8 , SH_UN REG64_FLD( EQ_HTM_LAST_ADDRESS_LEN , 49 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_ADDRESS_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_LAST_ADDRESS , 8 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_LAST_ADDRESS , 8 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_ADDRESS ); -REG64_FLD( EX_CHTMLBS0_HTM_LAST_ADDRESS_LEN , 49 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , - SH_FLD_ADDRESS_LEN ); - -REG64_FLD( EX_CHTMLBS1_HTM_LAST_ADDRESS , 8 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_ADDRESS ); -REG64_FLD( EX_CHTMLBS1_HTM_LAST_ADDRESS_LEN , 49 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_LAST_ADDRESS_LEN , 49 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_ADDRESS_LEN ); REG64_FLD( EQ_HTM_MEM_HTMSC_ALLOC , 0 , SH_UNT_EQ , SH_ACS_SCOM_RW , @@ -7878,50 +7806,27 @@ REG64_FLD( EQ_HTM_MEM_HTMSC_SIZE , 40 , SH_UN REG64_FLD( EQ_HTM_MEM_HTMSC_SIZE_LEN , 9 , SH_UNT_EQ , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SIZE_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_MEM_HTMSC_ALLOC , 0 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_ALLOC ); -REG64_FLD( EX_CHTMLBS0_HTM_MEM_HTMSC_SCOPE , 1 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SCOPE ); -REG64_FLD( EX_CHTMLBS0_HTM_MEM_HTMSC_SCOPE_LEN , 3 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SCOPE_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_MEM_HTMSC_PRIORITY , 4 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_PRIORITY ); -REG64_FLD( EX_CHTMLBS0_HTM_MEM_HTMSC_SIZE_SMALL , 5 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SIZE_SMALL ); -REG64_FLD( EX_CHTMLBS0_HTM_MEM_HTMSC_SPARE , 6 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SPARE ); -REG64_FLD( EX_CHTMLBS0_HTM_MEM_HTMSC_SPARE_LEN , 2 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SPARE_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_MEM_HTMSC_BASE , 8 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_BASE ); -REG64_FLD( EX_CHTMLBS0_HTM_MEM_HTMSC_BASE_LEN , 32 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_BASE_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_MEM_HTMSC_SIZE , 40 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SIZE ); -REG64_FLD( EX_CHTMLBS0_HTM_MEM_HTMSC_SIZE_LEN , 9 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SIZE_LEN ); - -REG64_FLD( EX_CHTMLBS1_HTM_MEM_HTMSC_ALLOC , 0 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MEM_HTMSC_ALLOC , 0 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_ALLOC ); -REG64_FLD( EX_CHTMLBS1_HTM_MEM_HTMSC_SCOPE , 1 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MEM_HTMSC_SCOPE , 1 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SCOPE ); -REG64_FLD( EX_CHTMLBS1_HTM_MEM_HTMSC_SCOPE_LEN , 3 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MEM_HTMSC_SCOPE_LEN , 3 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SCOPE_LEN ); -REG64_FLD( EX_CHTMLBS1_HTM_MEM_HTMSC_PRIORITY , 4 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MEM_HTMSC_PRIORITY , 4 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_PRIORITY ); -REG64_FLD( EX_CHTMLBS1_HTM_MEM_HTMSC_SIZE_SMALL , 5 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MEM_HTMSC_SIZE_SMALL , 5 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SIZE_SMALL ); -REG64_FLD( EX_CHTMLBS1_HTM_MEM_HTMSC_SPARE , 6 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MEM_HTMSC_SPARE , 6 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SPARE ); -REG64_FLD( EX_CHTMLBS1_HTM_MEM_HTMSC_SPARE_LEN , 2 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MEM_HTMSC_SPARE_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SPARE_LEN ); -REG64_FLD( EX_CHTMLBS1_HTM_MEM_HTMSC_BASE , 8 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MEM_HTMSC_BASE , 8 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_BASE ); -REG64_FLD( EX_CHTMLBS1_HTM_MEM_HTMSC_BASE_LEN , 32 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MEM_HTMSC_BASE_LEN , 32 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_BASE_LEN ); -REG64_FLD( EX_CHTMLBS1_HTM_MEM_HTMSC_SIZE , 40 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MEM_HTMSC_SIZE , 40 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SIZE ); -REG64_FLD( EX_CHTMLBS1_HTM_MEM_HTMSC_SIZE_LEN , 9 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MEM_HTMSC_SIZE_LEN , 9 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SIZE_LEN ); REG64_FLD( EQ_HTM_MODE_HTMSC_ENABLE , 0 , SH_UNT_EQ , SH_ACS_SCOM_RW , @@ -7963,82 +7868,43 @@ REG64_FLD( EQ_HTM_MODE_HTMSC_VGTARGET , 24 , SH_UN REG64_FLD( EQ_HTM_MODE_HTMSC_VGTARGET_LEN , 16 , SH_UNT_EQ , SH_ACS_SCOM_RW , SH_FLD_HTMSC_VGTARGET_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_ENABLE , 0 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_ENABLE ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_CONTENT_SEL , 1 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_CONTENT_SEL ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_CONTENT_SEL_LEN , 2 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_CONTENT_SEL_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_SPARE0 , 3 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SPARE0 ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_CAPTURE , 4 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_CAPTURE ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_CAPTURE_LEN , 6 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_CAPTURE_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_DD1EQUIV , 10 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_DD1EQUIV ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_SPARE_1TO2 , 11 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SPARE_1TO2 ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_SPARE_1TO2_LEN , 2 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SPARE_1TO2_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_WRAP , 13 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_WRAP ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_DIS_TSTAMP , 14 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_DIS_TSTAMP ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_SINGLE_TSTAMP , 15 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SINGLE_TSTAMP ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_DIS_STALL , 16 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_DIS_STALL ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_MARKERS_ONLY , 17 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_MARKERS_ONLY ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_DIS_GROUP , 18 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_DIS_GROUP ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_SPARES , 19 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SPARES ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_SPARES_LEN , 5 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_SPARES_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_VGTARGET , 24 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_VGTARGET ); -REG64_FLD( EX_CHTMLBS0_HTM_MODE_HTMSC_VGTARGET_LEN , 16 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_VGTARGET_LEN ); - -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_ENABLE , 0 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_ENABLE , 0 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_ENABLE ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_CONTENT_SEL , 1 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_CONTENT_SEL , 1 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_CONTENT_SEL ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_CONTENT_SEL_LEN , 2 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_CONTENT_SEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_CONTENT_SEL_LEN ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_SPARE0 , 3 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_SPARE0 , 3 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SPARE0 ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_CAPTURE , 4 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_CAPTURE , 4 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_CAPTURE ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_CAPTURE_LEN , 6 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_CAPTURE_LEN , 6 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_CAPTURE_LEN ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_DD1EQUIV , 10 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_DD1EQUIV , 10 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_DD1EQUIV ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_SPARE_1TO2 , 11 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_SPARE_1TO2 , 11 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SPARE_1TO2 ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_SPARE_1TO2_LEN , 2 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_SPARE_1TO2_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SPARE_1TO2_LEN ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_WRAP , 13 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_WRAP , 13 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_WRAP ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_DIS_TSTAMP , 14 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_DIS_TSTAMP , 14 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_DIS_TSTAMP ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_SINGLE_TSTAMP , 15 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_SINGLE_TSTAMP , 15 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SINGLE_TSTAMP ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_DIS_STALL , 16 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_DIS_STALL , 16 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_DIS_STALL ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_MARKERS_ONLY , 17 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_MARKERS_ONLY , 17 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_MARKERS_ONLY ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_DIS_GROUP , 18 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_DIS_GROUP , 18 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_DIS_GROUP ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_SPARES , 19 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_SPARES , 19 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SPARES ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_SPARES_LEN , 5 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_SPARES_LEN , 5 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_SPARES_LEN ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_VGTARGET , 24 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_VGTARGET , 24 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_VGTARGET ); -REG64_FLD( EX_CHTMLBS1_HTM_MODE_HTMSC_VGTARGET_LEN , 16 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_MODE_HTMSC_VGTARGET_LEN , 16 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_VGTARGET_LEN ); REG64_FLD( EQ_HTM_STAT_HTMCO_STATUS_PURGE_IN_PROG , 0 , SH_UNT_EQ , SH_ACS_SCOM_RO , @@ -8082,86 +7948,45 @@ REG64_FLD( EQ_HTM_STAT_STATUS_UNUSED , 18 , SH_UN REG64_FLD( EQ_HTM_STAT_STATUS_UNUSED_LEN , 2 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_STATUS_UNUSED_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_HTMCO_STATUS_PURGE_IN_PROG , 0 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_HTMCO_STATUS_PURGE_IN_PROG , 0 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMCO_STATUS_PURGE_IN_PROG ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_HTMCO_STATUS_PURGE_DONE , 1 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_HTMCO_STATUS_PURGE_DONE , 1 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMCO_STATUS_PURGE_DONE ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_HTMCO_STATUS_CRESP_OV , 2 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_HTMCO_STATUS_CRESP_OV , 2 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMCO_STATUS_CRESP_OV ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_HTMCO_STATUS_REPAIR , 3 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_HTMCO_STATUS_REPAIR , 3 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMCO_STATUS_REPAIR ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_HTMCO_STATUS_BUF_WAIT , 4 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_HTMCO_STATUS_BUF_WAIT , 4 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMCO_STATUS_BUF_WAIT ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_STATUS_TRIG_DROPPED_Q , 5 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_STATUS_TRIG_DROPPED_Q , 5 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_STATUS_TRIG_DROPPED_Q ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_HTMCO_STATUS_ADDR_ERROR , 6 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_HTMCO_STATUS_ADDR_ERROR , 6 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMCO_STATUS_ADDR_ERROR ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_STATUS_REC_DROPPED_Q , 7 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_STATUS_REC_DROPPED_Q , 7 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_STATUS_REC_DROPPED_Q ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_HTMCO_STATUS_INIT , 8 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_HTMCO_STATUS_INIT , 8 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMCO_STATUS_INIT ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_HTMCO_STATUS_PREREQ , 9 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_HTMCO_STATUS_PREREQ , 9 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMCO_STATUS_PREREQ ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_HTMCO_STATUS_READY , 10 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_HTMCO_STATUS_READY , 10 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMCO_STATUS_READY ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_HTMCO_STATUS_TRACING , 11 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_HTMCO_STATUS_TRACING , 11 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMCO_STATUS_TRACING ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_HTMCO_STATUS_PAUSED , 12 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_HTMCO_STATUS_PAUSED , 12 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMCO_STATUS_PAUSED ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_HTMCO_STATUS_FLUSH , 13 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_HTMCO_STATUS_FLUSH , 13 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMCO_STATUS_FLUSH ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_HTMCO_STATUS_COMPLETE , 14 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_HTMCO_STATUS_COMPLETE , 14 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMCO_STATUS_COMPLETE ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_HTMCO_STATUS_ENABLE , 15 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_HTMCO_STATUS_ENABLE , 15 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMCO_STATUS_ENABLE ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_HTMCO_STATUS_STAMP , 16 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_HTMCO_STATUS_STAMP , 16 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_HTMCO_STATUS_STAMP ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_STATUS_SCOM_ERROR , 17 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_STATUS_SCOM_ERROR , 17 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_STATUS_SCOM_ERROR ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_STATUS_UNUSED , 18 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_STATUS_UNUSED , 18 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_STATUS_UNUSED ); -REG64_FLD( EX_CHTMLBS0_HTM_STAT_STATUS_UNUSED_LEN , 2 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RO , - SH_FLD_STATUS_UNUSED_LEN ); - -REG64_FLD( EX_CHTMLBS1_HTM_STAT_HTMCO_STATUS_PURGE_IN_PROG , 0 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_HTMCO_STATUS_PURGE_IN_PROG ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_HTMCO_STATUS_PURGE_DONE , 1 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_HTMCO_STATUS_PURGE_DONE ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_HTMCO_STATUS_CRESP_OV , 2 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_HTMCO_STATUS_CRESP_OV ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_HTMCO_STATUS_REPAIR , 3 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_HTMCO_STATUS_REPAIR ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_HTMCO_STATUS_BUF_WAIT , 4 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_HTMCO_STATUS_BUF_WAIT ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_STATUS_TRIG_DROPPED_Q , 5 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_STATUS_TRIG_DROPPED_Q ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_HTMCO_STATUS_ADDR_ERROR , 6 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_HTMCO_STATUS_ADDR_ERROR ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_STATUS_REC_DROPPED_Q , 7 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_STATUS_REC_DROPPED_Q ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_HTMCO_STATUS_INIT , 8 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_HTMCO_STATUS_INIT ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_HTMCO_STATUS_PREREQ , 9 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_HTMCO_STATUS_PREREQ ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_HTMCO_STATUS_READY , 10 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_HTMCO_STATUS_READY ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_HTMCO_STATUS_TRACING , 11 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_HTMCO_STATUS_TRACING ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_HTMCO_STATUS_PAUSED , 12 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_HTMCO_STATUS_PAUSED ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_HTMCO_STATUS_FLUSH , 13 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_HTMCO_STATUS_FLUSH ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_HTMCO_STATUS_COMPLETE , 14 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_HTMCO_STATUS_COMPLETE ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_HTMCO_STATUS_ENABLE , 15 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_HTMCO_STATUS_ENABLE ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_HTMCO_STATUS_STAMP , 16 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_HTMCO_STATUS_STAMP ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_STATUS_SCOM_ERROR , 17 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_STATUS_SCOM_ERROR ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_STATUS_UNUSED , 18 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , - SH_FLD_STATUS_UNUSED ); -REG64_FLD( EX_CHTMLBS1_HTM_STAT_STATUS_UNUSED_LEN , 2 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RO , +REG64_FLD( EX_HTM_STAT_STATUS_UNUSED_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM_RO , SH_FLD_STATUS_UNUSED_LEN ); REG64_FLD( EQ_HTM_TRIG_HTMSC_START , 0 , SH_UNT_EQ , SH_ACS_SCOM_RW , @@ -8181,38 +8006,21 @@ REG64_FLD( EQ_HTM_TRIG_HTMSC_MARK_TYPE , 6 , SH_UN REG64_FLD( EQ_HTM_TRIG_HTMSC_MARK_TYPE_LEN , 10 , SH_UNT_EQ , SH_ACS_SCOM_RW , SH_FLD_HTMSC_MARK_TYPE_LEN ); -REG64_FLD( EX_CHTMLBS0_HTM_TRIG_HTMSC_START , 0 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_START ); -REG64_FLD( EX_CHTMLBS0_HTM_TRIG_HTMSC_STOP , 1 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_STOP ); -REG64_FLD( EX_CHTMLBS0_HTM_TRIG_HTMSC_PAUSE , 2 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_PAUSE ); -REG64_FLD( EX_CHTMLBS0_HTM_TRIG_HTMSC_STOP_ALT , 3 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_STOP_ALT ); -REG64_FLD( EX_CHTMLBS0_HTM_TRIG_HTMSC_RESET , 4 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_RESET ); -REG64_FLD( EX_CHTMLBS0_HTM_TRIG_HTMSC_MARK_VALID , 5 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_MARK_VALID ); -REG64_FLD( EX_CHTMLBS0_HTM_TRIG_HTMSC_MARK_TYPE , 6 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_MARK_TYPE ); -REG64_FLD( EX_CHTMLBS0_HTM_TRIG_HTMSC_MARK_TYPE_LEN , 10 , SH_UNT_EX_CHTMLBS0, SH_ACS_SCOM_RW , - SH_FLD_HTMSC_MARK_TYPE_LEN ); - -REG64_FLD( EX_CHTMLBS1_HTM_TRIG_HTMSC_START , 0 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_TRIG_HTMSC_START , 0 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_START ); -REG64_FLD( EX_CHTMLBS1_HTM_TRIG_HTMSC_STOP , 1 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_TRIG_HTMSC_STOP , 1 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_STOP ); -REG64_FLD( EX_CHTMLBS1_HTM_TRIG_HTMSC_PAUSE , 2 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_TRIG_HTMSC_PAUSE , 2 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_PAUSE ); -REG64_FLD( EX_CHTMLBS1_HTM_TRIG_HTMSC_STOP_ALT , 3 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_TRIG_HTMSC_STOP_ALT , 3 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_STOP_ALT ); -REG64_FLD( EX_CHTMLBS1_HTM_TRIG_HTMSC_RESET , 4 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_TRIG_HTMSC_RESET , 4 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_RESET ); -REG64_FLD( EX_CHTMLBS1_HTM_TRIG_HTMSC_MARK_VALID , 5 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_TRIG_HTMSC_MARK_VALID , 5 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_MARK_VALID ); -REG64_FLD( EX_CHTMLBS1_HTM_TRIG_HTMSC_MARK_TYPE , 6 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_TRIG_HTMSC_MARK_TYPE , 6 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_MARK_TYPE ); -REG64_FLD( EX_CHTMLBS1_HTM_TRIG_HTMSC_MARK_TYPE_LEN , 10 , SH_UNT_EX_CHTMLBS1, SH_ACS_SCOM_RW , +REG64_FLD( EX_HTM_TRIG_HTMSC_MARK_TYPE_LEN , 10 , SH_UNT_EX , SH_ACS_SCOM_RW , SH_FLD_HTMSC_MARK_TYPE_LEN ); REG64_FLD( EQ_INJECT_REG_THERM_TRIP , 0 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14320,6 +14128,11 @@ REG64_FLD( EQ_TPLC20_TR0_TRACE_HI_DATA_REG_DATA , 0 , SH_UN REG64_FLD( EQ_TPLC20_TR0_TRACE_HI_DATA_REG_DATA_LEN , 64 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_DATA_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_HI_DATA_REG_DATA , 0 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_DATA ); +REG64_FLD( EX_TPLC20_TR0_TRACE_HI_DATA_REG_DATA_LEN , 64 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_DATA_LEN ); + REG64_FLD( EQ_TPLC20_TR0_TRACE_LO_DATA_REG_DATA , 0 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_DATA ); REG64_FLD( EQ_TPLC20_TR0_TRACE_LO_DATA_REG_DATA_LEN , 32 , SH_UNT_EQ , SH_ACS_SCOM_RO , @@ -14343,21 +14156,59 @@ REG64_FLD( EQ_TPLC20_TR0_TRACE_LO_DATA_REG_HOLD_ADDRESS , 54 , SH_UN REG64_FLD( EQ_TPLC20_TR0_TRACE_LO_DATA_REG_HOLD_ADDRESS_LEN , 10 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_HOLD_ADDRESS_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_LO_DATA_REG_DATA , 0 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_DATA ); +REG64_FLD( EX_TPLC20_TR0_TRACE_LO_DATA_REG_DATA_LEN , 32 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_DATA_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_LO_DATA_REG_ADDRESS , 32 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_ADDRESS ); +REG64_FLD( EX_TPLC20_TR0_TRACE_LO_DATA_REG_ADDRESS_LEN , 10 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_ADDRESS_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_LO_DATA_REG_LAST_BANK , 42 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_LAST_BANK ); +REG64_FLD( EX_TPLC20_TR0_TRACE_LO_DATA_REG_LAST_BANK_LEN , 9 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_LAST_BANK_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_LO_DATA_REG_LAST_BANK_VALID , 51 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_LAST_BANK_VALID ); +REG64_FLD( EX_TPLC20_TR0_TRACE_LO_DATA_REG_WRITE_ON_RUN , 52 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_WRITE_ON_RUN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_LO_DATA_REG_RUNNING , 53 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_RUNNING ); +REG64_FLD( EX_TPLC20_TR0_TRACE_LO_DATA_REG_HOLD_ADDRESS , 54 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_HOLD_ADDRESS ); +REG64_FLD( EX_TPLC20_TR0_TRACE_LO_DATA_REG_HOLD_ADDRESS_LEN , 10 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_HOLD_ADDRESS_LEN ); + REG64_FLD( EQ_TPLC20_TR0_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_STORE_ON_TRIG_MODE ); REG64_FLD( EQ_TPLC20_TR0_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE_LEN , 22 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_STORE_ON_TRIG_MODE_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_STORE_ON_TRIG_MODE ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE_LEN , 22 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_STORE_ON_TRIG_MODE_LEN ); + REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63 , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_TO_63 ); REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63_LEN , 64 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_TO_63_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63 , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_CMP_MSK_LT_B_TO_63 ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63_LEN , 64 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_CMP_MSK_LT_B_TO_63_LEN ); + REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87 , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_64_TO_87 ); REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_64_TO_87_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87 , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_CMP_MSK_LT_B_64_TO_87 ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_CMP_MSK_LT_B_64_TO_87_LEN ); + REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_2_PATTERNA , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERNA ); REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_2_PATTERNA_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14367,6 +14218,15 @@ REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_2_PATTERNB , 24 , SH_UN REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_2_PATTERNB_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERNB_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_2_PATTERNA , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERNA ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_2_PATTERNA_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERNA_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_2_PATTERNB , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERNB ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_2_PATTERNB_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERNB_LEN ); + REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_3_PATTERNC , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERNC ); REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_3_PATTERNC_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14376,6 +14236,15 @@ REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_3_PATTERND , 24 , SH_UN REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_3_PATTERND_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERND_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_3_PATTERNC , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERNC ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_3_PATTERNC_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERNC_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_3_PATTERND , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERND ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_3_PATTERND_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERND_LEN ); + REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_4_MASKA , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKA ); REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_4_MASKA_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14385,6 +14254,15 @@ REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_4_MASKB , 24 , SH_UN REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_4_MASKB_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKB_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_4_MASKA , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKA ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_4_MASKA_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKA_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_4_MASKB , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKB ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_4_MASKB_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKB_LEN ); + REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_5_MASKC , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKC ); REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_5_MASKC_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14394,6 +14272,15 @@ REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_5_MASKD , 24 , SH_UN REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_5_MASKD_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKD_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_5_MASKC , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKC ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_5_MASKC_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKC_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_5_MASKD , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKD ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_5_MASKD_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKD_LEN ); + REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_DISABLE_COMPRESSION , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_DISABLE_COMPRESSION ); REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_ERROR_BIT_COMPRESSION_CARE_MASK , 1 , SH_UNT_EQ , @@ -14439,11 +14326,61 @@ REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE , 28 , SH_UN REG64_FLD( EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE_LEN , 4 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MATCH_NOT_MODE_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_DISABLE_COMPRESSION , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_DISABLE_COMPRESSION ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_ERROR_BIT_COMPRESSION_CARE_MASK , 1 , SH_UNT_EX , + SH_ACS_SCOM , SH_FLD_ERROR_BIT_COMPRESSION_CARE_MASK ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_MATCHA_MUXSEL , 2 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHA_MUXSEL ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_MATCHA_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHA_MUXSEL_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_MATCHB_MUXSEL , 4 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHB_MUXSEL ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_MATCHB_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHB_MUXSEL_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_MATCHC_MUXSEL , 6 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHC_MUXSEL ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_MATCHC_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHC_MUXSEL_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_MATCHD_MUXSEL , 8 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHD_MUXSEL ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_MATCHD_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHD_MUXSEL_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_TRIG0_OR_MASK , 10 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG0_OR_MASK ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_TRIG0_OR_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG0_OR_MASK_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_TRIG0_AND_MASK , 14 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG0_AND_MASK ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_TRIG0_AND_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG0_AND_MASK_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_TRIG1_OR_MASK , 18 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG1_OR_MASK ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_TRIG1_OR_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG1_OR_MASK_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_TRIG1_AND_MASK , 22 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG1_AND_MASK ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_TRIG1_AND_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG1_AND_MASK_LEN ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_TRIG0_NOT_MODE , 26 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG0_NOT_MODE ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_TRIG1_NOT_MODE , 27 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG1_NOT_MODE ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE , 28 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCH_NOT_MODE ); +REG64_FLD( EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCH_NOT_MODE_LEN ); + REG64_FLD( EQ_TPLC20_TR1_TRACE_HI_DATA_REG_DATA , 0 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_DATA ); REG64_FLD( EQ_TPLC20_TR1_TRACE_HI_DATA_REG_DATA_LEN , 64 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_DATA_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_HI_DATA_REG_DATA , 0 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_DATA ); +REG64_FLD( EX_TPLC20_TR1_TRACE_HI_DATA_REG_DATA_LEN , 64 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_DATA_LEN ); + REG64_FLD( EQ_TPLC20_TR1_TRACE_LO_DATA_REG_DATA , 0 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_DATA ); REG64_FLD( EQ_TPLC20_TR1_TRACE_LO_DATA_REG_DATA_LEN , 32 , SH_UNT_EQ , SH_ACS_SCOM_RO , @@ -14467,21 +14404,59 @@ REG64_FLD( EQ_TPLC20_TR1_TRACE_LO_DATA_REG_HOLD_ADDRESS , 54 , SH_UN REG64_FLD( EQ_TPLC20_TR1_TRACE_LO_DATA_REG_HOLD_ADDRESS_LEN , 10 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_HOLD_ADDRESS_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_LO_DATA_REG_DATA , 0 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_DATA ); +REG64_FLD( EX_TPLC20_TR1_TRACE_LO_DATA_REG_DATA_LEN , 32 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_DATA_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_LO_DATA_REG_ADDRESS , 32 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_ADDRESS ); +REG64_FLD( EX_TPLC20_TR1_TRACE_LO_DATA_REG_ADDRESS_LEN , 10 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_ADDRESS_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_LO_DATA_REG_LAST_BANK , 42 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_LAST_BANK ); +REG64_FLD( EX_TPLC20_TR1_TRACE_LO_DATA_REG_LAST_BANK_LEN , 9 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_LAST_BANK_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_LO_DATA_REG_LAST_BANK_VALID , 51 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_LAST_BANK_VALID ); +REG64_FLD( EX_TPLC20_TR1_TRACE_LO_DATA_REG_WRITE_ON_RUN , 52 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_WRITE_ON_RUN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_LO_DATA_REG_RUNNING , 53 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_RUNNING ); +REG64_FLD( EX_TPLC20_TR1_TRACE_LO_DATA_REG_HOLD_ADDRESS , 54 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_HOLD_ADDRESS ); +REG64_FLD( EX_TPLC20_TR1_TRACE_LO_DATA_REG_HOLD_ADDRESS_LEN , 10 , SH_UNT_EX , SH_ACS_SCOM_RO , + SH_FLD_HOLD_ADDRESS_LEN ); + REG64_FLD( EQ_TPLC20_TR1_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_STORE_ON_TRIG_MODE ); REG64_FLD( EQ_TPLC20_TR1_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE_LEN , 22 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_STORE_ON_TRIG_MODE_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_STORE_ON_TRIG_MODE ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE_LEN , 22 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_STORE_ON_TRIG_MODE_LEN ); + REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63 , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_TO_63 ); REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63_LEN , 64 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_TO_63_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63 , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_CMP_MSK_LT_B_TO_63 ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63_LEN , 64 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_CMP_MSK_LT_B_TO_63_LEN ); + REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87 , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_64_TO_87 ); REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_64_TO_87_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87 , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_CMP_MSK_LT_B_64_TO_87 ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_CMP_MSK_LT_B_64_TO_87_LEN ); + REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_2_PATTERNA , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERNA ); REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_2_PATTERNA_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14491,6 +14466,15 @@ REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_2_PATTERNB , 24 , SH_UN REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_2_PATTERNB_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERNB_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_2_PATTERNA , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERNA ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_2_PATTERNA_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERNA_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_2_PATTERNB , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERNB ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_2_PATTERNB_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERNB_LEN ); + REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_3_PATTERNC , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERNC ); REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_3_PATTERNC_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14500,6 +14484,15 @@ REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_3_PATTERND , 24 , SH_UN REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_3_PATTERND_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERND_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_3_PATTERNC , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERNC ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_3_PATTERNC_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERNC_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_3_PATTERND , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERND ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_3_PATTERND_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_PATTERND_LEN ); + REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_4_MASKA , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKA ); REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_4_MASKA_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14509,6 +14502,15 @@ REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_4_MASKB , 24 , SH_UN REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_4_MASKB_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKB_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_4_MASKA , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKA ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_4_MASKA_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKA_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_4_MASKB , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKB ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_4_MASKB_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKB_LEN ); + REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_5_MASKC , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKC ); REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_5_MASKC_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14518,6 +14520,15 @@ REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_5_MASKD , 24 , SH_UN REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_5_MASKD_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKD_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_5_MASKC , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKC ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_5_MASKC_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKC_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_5_MASKD , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKD ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_5_MASKD_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MASKD_LEN ); + REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_DISABLE_COMPRESSION , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_DISABLE_COMPRESSION ); REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_ERROR_BIT_COMPRESSION_CARE_MASK , 1 , SH_UNT_EQ , @@ -14563,16 +14574,56 @@ REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE , 28 , SH_UN REG64_FLD( EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE_LEN , 4 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MATCH_NOT_MODE_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_DISABLE_COMPRESSION , 0 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_DISABLE_COMPRESSION ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_ERROR_BIT_COMPRESSION_CARE_MASK , 1 , SH_UNT_EX , + SH_ACS_SCOM , SH_FLD_ERROR_BIT_COMPRESSION_CARE_MASK ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_MATCHA_MUXSEL , 2 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHA_MUXSEL ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_MATCHA_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHA_MUXSEL_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_MATCHB_MUXSEL , 4 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHB_MUXSEL ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_MATCHB_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHB_MUXSEL_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_MATCHC_MUXSEL , 6 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHC_MUXSEL ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_MATCHC_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHC_MUXSEL_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_MATCHD_MUXSEL , 8 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHD_MUXSEL ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_MATCHD_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCHD_MUXSEL_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_TRIG0_OR_MASK , 10 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG0_OR_MASK ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_TRIG0_OR_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG0_OR_MASK_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_TRIG0_AND_MASK , 14 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG0_AND_MASK ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_TRIG0_AND_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG0_AND_MASK_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_TRIG1_OR_MASK , 18 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG1_OR_MASK ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_TRIG1_OR_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG1_OR_MASK_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_TRIG1_AND_MASK , 22 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG1_AND_MASK ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_TRIG1_AND_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG1_AND_MASK_LEN ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_TRIG0_NOT_MODE , 26 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG0_NOT_MODE ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_TRIG1_NOT_MODE , 27 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_TRIG1_NOT_MODE ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE , 28 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCH_NOT_MODE ); +REG64_FLD( EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , + SH_FLD_MATCH_NOT_MODE_LEN ); + REG64_FLD( EQ_TPLC21_TR0_TRACE_HI_DATA_REG_DATA , 0 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_DATA ); REG64_FLD( EQ_TPLC21_TR0_TRACE_HI_DATA_REG_DATA_LEN , 64 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_DATA_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_HI_DATA_REG_DATA , 0 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_DATA ); -REG64_FLD( EX_TPLC21_TR0_TRACE_HI_DATA_REG_DATA_LEN , 64 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_DATA_LEN ); - REG64_FLD( EQ_TPLC21_TR0_TRACE_LO_DATA_REG_DATA , 0 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_DATA ); REG64_FLD( EQ_TPLC21_TR0_TRACE_LO_DATA_REG_DATA_LEN , 32 , SH_UNT_EQ , SH_ACS_SCOM_RO , @@ -14596,59 +14647,21 @@ REG64_FLD( EQ_TPLC21_TR0_TRACE_LO_DATA_REG_HOLD_ADDRESS , 54 , SH_UN REG64_FLD( EQ_TPLC21_TR0_TRACE_LO_DATA_REG_HOLD_ADDRESS_LEN , 10 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_HOLD_ADDRESS_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_LO_DATA_REG_DATA , 0 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_DATA ); -REG64_FLD( EX_TPLC21_TR0_TRACE_LO_DATA_REG_DATA_LEN , 32 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_DATA_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_LO_DATA_REG_ADDRESS , 32 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_ADDRESS ); -REG64_FLD( EX_TPLC21_TR0_TRACE_LO_DATA_REG_ADDRESS_LEN , 10 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_ADDRESS_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_LO_DATA_REG_LAST_BANK , 42 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_LAST_BANK ); -REG64_FLD( EX_TPLC21_TR0_TRACE_LO_DATA_REG_LAST_BANK_LEN , 9 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_LAST_BANK_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_LO_DATA_REG_LAST_BANK_VALID , 51 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_LAST_BANK_VALID ); -REG64_FLD( EX_TPLC21_TR0_TRACE_LO_DATA_REG_WRITE_ON_RUN , 52 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_WRITE_ON_RUN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_LO_DATA_REG_RUNNING , 53 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_RUNNING ); -REG64_FLD( EX_TPLC21_TR0_TRACE_LO_DATA_REG_HOLD_ADDRESS , 54 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_HOLD_ADDRESS ); -REG64_FLD( EX_TPLC21_TR0_TRACE_LO_DATA_REG_HOLD_ADDRESS_LEN , 10 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_HOLD_ADDRESS_LEN ); - REG64_FLD( EQ_TPLC21_TR0_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_STORE_ON_TRIG_MODE ); REG64_FLD( EQ_TPLC21_TR0_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE_LEN , 22 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_STORE_ON_TRIG_MODE_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_STORE_ON_TRIG_MODE ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE_LEN , 22 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_STORE_ON_TRIG_MODE_LEN ); - REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63 , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_TO_63 ); REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63_LEN , 64 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_TO_63_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63 , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_CMP_MSK_LT_B_TO_63 ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63_LEN , 64 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_CMP_MSK_LT_B_TO_63_LEN ); - REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87 , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_64_TO_87 ); REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_64_TO_87_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87 , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_CMP_MSK_LT_B_64_TO_87 ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_CMP_MSK_LT_B_64_TO_87_LEN ); - REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_2_PATTERNA , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERNA ); REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_2_PATTERNA_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14658,15 +14671,6 @@ REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_2_PATTERNB , 24 , SH_UN REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_2_PATTERNB_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERNB_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_2_PATTERNA , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERNA ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_2_PATTERNA_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERNA_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_2_PATTERNB , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERNB ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_2_PATTERNB_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERNB_LEN ); - REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_3_PATTERNC , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERNC ); REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_3_PATTERNC_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14676,15 +14680,6 @@ REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_3_PATTERND , 24 , SH_UN REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_3_PATTERND_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERND_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_3_PATTERNC , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERNC ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_3_PATTERNC_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERNC_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_3_PATTERND , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERND ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_3_PATTERND_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERND_LEN ); - REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_4_MASKA , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKA ); REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_4_MASKA_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14694,15 +14689,6 @@ REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_4_MASKB , 24 , SH_UN REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_4_MASKB_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKB_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_4_MASKA , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKA ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_4_MASKA_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKA_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_4_MASKB , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKB ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_4_MASKB_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKB_LEN ); - REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_5_MASKC , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKC ); REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_5_MASKC_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14712,15 +14698,6 @@ REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_5_MASKD , 24 , SH_UN REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_5_MASKD_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKD_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_5_MASKC , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKC ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_5_MASKC_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKC_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_5_MASKD , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKD ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_5_MASKD_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKD_LEN ); - REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_DISABLE_COMPRESSION , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_DISABLE_COMPRESSION ); REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_ERROR_BIT_COMPRESSION_CARE_MASK , 1 , SH_UNT_EQ , @@ -14766,61 +14743,11 @@ REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE , 28 , SH_UN REG64_FLD( EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE_LEN , 4 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MATCH_NOT_MODE_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_DISABLE_COMPRESSION , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_DISABLE_COMPRESSION ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_ERROR_BIT_COMPRESSION_CARE_MASK , 1 , SH_UNT_EX , - SH_ACS_SCOM , SH_FLD_ERROR_BIT_COMPRESSION_CARE_MASK ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_MATCHA_MUXSEL , 2 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHA_MUXSEL ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_MATCHA_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHA_MUXSEL_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_MATCHB_MUXSEL , 4 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHB_MUXSEL ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_MATCHB_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHB_MUXSEL_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_MATCHC_MUXSEL , 6 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHC_MUXSEL ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_MATCHC_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHC_MUXSEL_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_MATCHD_MUXSEL , 8 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHD_MUXSEL ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_MATCHD_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHD_MUXSEL_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_TRIG0_OR_MASK , 10 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG0_OR_MASK ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_TRIG0_OR_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG0_OR_MASK_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_TRIG0_AND_MASK , 14 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG0_AND_MASK ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_TRIG0_AND_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG0_AND_MASK_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_TRIG1_OR_MASK , 18 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG1_OR_MASK ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_TRIG1_OR_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG1_OR_MASK_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_TRIG1_AND_MASK , 22 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG1_AND_MASK ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_TRIG1_AND_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG1_AND_MASK_LEN ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_TRIG0_NOT_MODE , 26 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG0_NOT_MODE ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_TRIG1_NOT_MODE , 27 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG1_NOT_MODE ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE , 28 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCH_NOT_MODE ); -REG64_FLD( EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCH_NOT_MODE_LEN ); - REG64_FLD( EQ_TPLC21_TR1_TRACE_HI_DATA_REG_DATA , 0 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_DATA ); REG64_FLD( EQ_TPLC21_TR1_TRACE_HI_DATA_REG_DATA_LEN , 64 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_DATA_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_HI_DATA_REG_DATA , 0 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_DATA ); -REG64_FLD( EX_TPLC21_TR1_TRACE_HI_DATA_REG_DATA_LEN , 64 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_DATA_LEN ); - REG64_FLD( EQ_TPLC21_TR1_TRACE_LO_DATA_REG_DATA , 0 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_DATA ); REG64_FLD( EQ_TPLC21_TR1_TRACE_LO_DATA_REG_DATA_LEN , 32 , SH_UNT_EQ , SH_ACS_SCOM_RO , @@ -14844,59 +14771,21 @@ REG64_FLD( EQ_TPLC21_TR1_TRACE_LO_DATA_REG_HOLD_ADDRESS , 54 , SH_UN REG64_FLD( EQ_TPLC21_TR1_TRACE_LO_DATA_REG_HOLD_ADDRESS_LEN , 10 , SH_UNT_EQ , SH_ACS_SCOM_RO , SH_FLD_HOLD_ADDRESS_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_LO_DATA_REG_DATA , 0 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_DATA ); -REG64_FLD( EX_TPLC21_TR1_TRACE_LO_DATA_REG_DATA_LEN , 32 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_DATA_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_LO_DATA_REG_ADDRESS , 32 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_ADDRESS ); -REG64_FLD( EX_TPLC21_TR1_TRACE_LO_DATA_REG_ADDRESS_LEN , 10 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_ADDRESS_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_LO_DATA_REG_LAST_BANK , 42 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_LAST_BANK ); -REG64_FLD( EX_TPLC21_TR1_TRACE_LO_DATA_REG_LAST_BANK_LEN , 9 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_LAST_BANK_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_LO_DATA_REG_LAST_BANK_VALID , 51 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_LAST_BANK_VALID ); -REG64_FLD( EX_TPLC21_TR1_TRACE_LO_DATA_REG_WRITE_ON_RUN , 52 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_WRITE_ON_RUN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_LO_DATA_REG_RUNNING , 53 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_RUNNING ); -REG64_FLD( EX_TPLC21_TR1_TRACE_LO_DATA_REG_HOLD_ADDRESS , 54 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_HOLD_ADDRESS ); -REG64_FLD( EX_TPLC21_TR1_TRACE_LO_DATA_REG_HOLD_ADDRESS_LEN , 10 , SH_UNT_EX , SH_ACS_SCOM_RO , - SH_FLD_HOLD_ADDRESS_LEN ); - REG64_FLD( EQ_TPLC21_TR1_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_STORE_ON_TRIG_MODE ); REG64_FLD( EQ_TPLC21_TR1_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE_LEN , 22 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_STORE_ON_TRIG_MODE_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_STORE_ON_TRIG_MODE ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRCTRL_CONFIG_STORE_ON_TRIG_MODE_LEN , 22 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_STORE_ON_TRIG_MODE_LEN ); - REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63 , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_TO_63 ); REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63_LEN , 64 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_TO_63_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63 , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_CMP_MSK_LT_B_TO_63 ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_0_CMP_MSK_LT_B_TO_63_LEN , 64 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_CMP_MSK_LT_B_TO_63_LEN ); - REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87 , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_64_TO_87 ); REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_CMP_MSK_LT_B_64_TO_87_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87 , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_CMP_MSK_LT_B_64_TO_87 ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_1_CMP_MSK_LT_B_64_TO_87_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_CMP_MSK_LT_B_64_TO_87_LEN ); - REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_2_PATTERNA , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERNA ); REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_2_PATTERNA_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14906,15 +14795,6 @@ REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_2_PATTERNB , 24 , SH_UN REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_2_PATTERNB_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERNB_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_2_PATTERNA , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERNA ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_2_PATTERNA_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERNA_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_2_PATTERNB , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERNB ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_2_PATTERNB_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERNB_LEN ); - REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_3_PATTERNC , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERNC ); REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_3_PATTERNC_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14924,15 +14804,6 @@ REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_3_PATTERND , 24 , SH_UN REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_3_PATTERND_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_PATTERND_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_3_PATTERNC , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERNC ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_3_PATTERNC_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERNC_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_3_PATTERND , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERND ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_3_PATTERND_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_PATTERND_LEN ); - REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_4_MASKA , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKA ); REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_4_MASKA_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14942,15 +14813,6 @@ REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_4_MASKB , 24 , SH_UN REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_4_MASKB_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKB_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_4_MASKA , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKA ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_4_MASKA_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKA_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_4_MASKB , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKB ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_4_MASKB_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKB_LEN ); - REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_5_MASKC , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKC ); REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_5_MASKC_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , @@ -14960,15 +14822,6 @@ REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_5_MASKD , 24 , SH_UN REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_5_MASKD_LEN , 24 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MASKD_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_5_MASKC , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKC ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_5_MASKC_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKC_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_5_MASKD , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKD ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_5_MASKD_LEN , 24 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MASKD_LEN ); - REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_DISABLE_COMPRESSION , 0 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_DISABLE_COMPRESSION ); REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_ERROR_BIT_COMPRESSION_CARE_MASK , 1 , SH_UNT_EQ , @@ -15014,51 +14867,6 @@ REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE , 28 , SH_UN REG64_FLD( EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE_LEN , 4 , SH_UNT_EQ , SH_ACS_SCOM , SH_FLD_MATCH_NOT_MODE_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_DISABLE_COMPRESSION , 0 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_DISABLE_COMPRESSION ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_ERROR_BIT_COMPRESSION_CARE_MASK , 1 , SH_UNT_EX , - SH_ACS_SCOM , SH_FLD_ERROR_BIT_COMPRESSION_CARE_MASK ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_MATCHA_MUXSEL , 2 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHA_MUXSEL ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_MATCHA_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHA_MUXSEL_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_MATCHB_MUXSEL , 4 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHB_MUXSEL ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_MATCHB_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHB_MUXSEL_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_MATCHC_MUXSEL , 6 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHC_MUXSEL ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_MATCHC_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHC_MUXSEL_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_MATCHD_MUXSEL , 8 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHD_MUXSEL ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_MATCHD_MUXSEL_LEN , 2 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCHD_MUXSEL_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_TRIG0_OR_MASK , 10 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG0_OR_MASK ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_TRIG0_OR_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG0_OR_MASK_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_TRIG0_AND_MASK , 14 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG0_AND_MASK ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_TRIG0_AND_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG0_AND_MASK_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_TRIG1_OR_MASK , 18 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG1_OR_MASK ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_TRIG1_OR_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG1_OR_MASK_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_TRIG1_AND_MASK , 22 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG1_AND_MASK ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_TRIG1_AND_MASK_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG1_AND_MASK_LEN ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_TRIG0_NOT_MODE , 26 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG0_NOT_MODE ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_TRIG1_NOT_MODE , 27 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_TRIG1_NOT_MODE ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE , 28 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCH_NOT_MODE ); -REG64_FLD( EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9_MATCH_NOT_MODE_LEN , 4 , SH_UNT_EX , SH_ACS_SCOM , - SH_FLD_MATCH_NOT_MODE_LEN ); - REG64_FLD( EX_V0_HMER_MALFUNCTION_ALERT , 0 , SH_UNT_EX , SH_ACS_SCOM2_OR , SH_FLD_MALFUNCTION_ALERT ); REG64_FLD( EX_V0_HMER_CME_REQUEST , 1 , SH_UNT_EX , SH_ACS_SCOM2_OR , diff --git a/import/chips/p9/common/include/p9_reg2constmap.txt b/import/chips/p9/common/include/p9_reg2constmap.txt index a636cce9..212be95e 100644 --- a/import/chips/p9/common/include/p9_reg2constmap.txt +++ b/import/chips/p9/common/include/p9_reg2constmap.txt @@ -755,9 +755,9 @@ PU_CME1_CME_SCOM_AFTR : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_AFTR PU_CME0_CME_SCOM_AFTR : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_AFTR PU_CME7_CME_SCOM_AFTR : TP.TCEP03.TPCL3.PPE.CME1.CME.CME_SCOM_AFTR EQ_CME_SCOM_BCEBAR0 : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_BCEBAR0 -EX_CME_SCOM_BCEBAR0 : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_BCEBAR0 +EX_CME_SCOM_BCEBAR0 : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_BCEBAR0 EQ_CME_SCOM_BCEBAR1 : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_BCEBAR1 -EX_CME_SCOM_BCEBAR1 : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_BCEBAR1 +EX_CME_SCOM_BCEBAR1 : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_BCEBAR1 EQ_CME_SCOM_BCECSR : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_BCECSR PU_CME4_CME_SCOM_BCECSR : TP.TCEP02.TPCL3.PPE.CME0.CME.CME_SCOM_BCECSR PU_CME3_CME_SCOM_BCECSR : TP.TCEP01.TPCL3.PPE.CME1.CME.CME_SCOM_BCECSR @@ -787,7 +787,7 @@ PU_CME1_CME_SCOM_CIDSR : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_CIDSR PU_CME0_CME_SCOM_CIDSR : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_CIDSR PU_CME7_CME_SCOM_CIDSR : TP.TCEP03.TPCL3.PPE.CME1.CME.CME_SCOM_CIDSR EQ_CME_SCOM_EIIR : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_EIIR -EX_CME_SCOM_EIIR : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_EIIR +EX_CME_SCOM_EIIR : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_EIIR EQ_CME_SCOM_FLAGS : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_FLAGS PU_CME4_CME_SCOM_FLAGS : TP.TCEP02.TPCL3.PPE.CME0.CME.CME_SCOM_FLAGS PU_CME3_CME_SCOM_FLAGS : TP.TCEP01.TPCL3.PPE.CME1.CME.CME_SCOM_FLAGS @@ -803,7 +803,7 @@ PU_CME1_CME_SCOM_FLAGS : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_FLAGS PU_CME0_CME_SCOM_FLAGS : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_FLAGS PU_CME7_CME_SCOM_FLAGS : TP.TCEP03.TPCL3.PPE.CME1.CME.CME_SCOM_FLAGS EQ_CME_SCOM_FWMR : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_FWMR -EX_CME_SCOM_FWMR : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_FWMR +EX_CME_SCOM_FWMR : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_FWMR EQ_CME_SCOM_IDCR : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_IDCR PU_CME4_CME_SCOM_IDCR : TP.TCEP02.TPCL3.PPE.CME0.CME.CME_SCOM_IDCR PU_CME3_CME_SCOM_IDCR : TP.TCEP01.TPCL3.PPE.CME1.CME.CME_SCOM_IDCR @@ -819,13 +819,13 @@ PU_CME1_CME_SCOM_IDCR : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_IDCR PU_CME0_CME_SCOM_IDCR : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_IDCR PU_CME7_CME_SCOM_IDCR : TP.TCEP03.TPCL3.PPE.CME1.CME.CME_SCOM_IDCR EQ_CME_SCOM_LFIR : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_LFIR -EX_CME_SCOM_LFIR : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_LFIR +EX_CME_SCOM_LFIR : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_LFIR EQ_CME_SCOM_LFIRACT0 : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_LFIRACT0 -EX_CME_SCOM_LFIRACT0 : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_LFIRACT0 +EX_CME_SCOM_LFIRACT0 : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_LFIRACT0 EQ_CME_SCOM_LFIRACT1 : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_LFIRACT1 -EX_CME_SCOM_LFIRACT1 : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_LFIRACT1 +EX_CME_SCOM_LFIRACT1 : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_LFIRACT1 EQ_CME_SCOM_LFIRMASK : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_LFIRMASK -EX_CME_SCOM_LFIRMASK : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_LFIRMASK +EX_CME_SCOM_LFIRMASK : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_LFIRMASK EQ_CME_SCOM_PMCRS0 : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_PMCRS0 PU_CME4_CME_SCOM_PMCRS0 : TP.TCEP02.TPCL3.PPE.CME0.CME.CME_SCOM_PMCRS0 PU_CME3_CME_SCOM_PMCRS0 : TP.TCEP01.TPCL3.PPE.CME1.CME.CME_SCOM_PMCRS0 @@ -1079,7 +1079,7 @@ PU_CME1_CME_SCOM_VCCR : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_VCCR PU_CME0_CME_SCOM_VCCR : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_VCCR PU_CME7_CME_SCOM_VCCR : TP.TCEP03.TPCL3.PPE.CME1.CME.CME_SCOM_VCCR EQ_CME_SCOM_VCTR : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_VCTR -EX_CME_SCOM_VCTR : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_VCTR +EX_CME_SCOM_VCTR : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_VCTR EQ_CME_SCOM_VDCR : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_VDCR PU_CME4_CME_SCOM_VDCR : TP.TCEP02.TPCL3.PPE.CME0.CME.CME_SCOM_VDCR PU_CME3_CME_SCOM_VDCR : TP.TCEP01.TPCL3.PPE.CME1.CME.CME_SCOM_VDCR @@ -1193,9 +1193,9 @@ PU_CME1_CME_SCOM_XIPCBMI1 : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_XIPCBMI1 PU_CME0_CME_SCOM_XIPCBMI1 : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_XIPCBMI1 PU_CME7_CME_SCOM_XIPCBMI1 : TP.TCEP03.TPCL3.PPE.CME1.CME.CME_SCOM_XIPCBMI1 EQ_CME_SCOM_XIPCBQ0 : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_XIPCBQ0 -EX_CME_SCOM_XIPCBQ0 : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_XIPCBQ0 +EX_CME_SCOM_XIPCBQ0 : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_XIPCBQ0 EQ_CME_SCOM_XIPCBQ1 : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_XIPCBQ1 -EX_CME_SCOM_XIPCBQ1 : TP.TCEP00.TPCL3.PPE.CME1.CME.CME_SCOM_XIPCBQ1 +EX_CME_SCOM_XIPCBQ1 : TP.TCEP00.TPCL3.PPE.CME0.CME.CME_SCOM_XIPCBQ1 PERV_FSI2PIB_COMMAND_REGISTER : TP.TPVSB.FSI.W.FSI2PIB.COMMAND_REGISTER PU_COMMAND_REGISTER : TP.TPCHIP.PIB.OTP.OTPC_M.COMMAND_REGISTER PERV_FSISHIFT_COMMAND_REGISTER : TP.TPVSB.FSI.W.FSI_SHIFT.COMMAND_REGISTER @@ -1409,15 +1409,15 @@ PERV_PIB2OPB1_CRSIS : TP.TPVSB.FSI.W.FSI_SLAVE.CMFSI_INCLUDE.MFSI_A.PIB2OPB.COMP PERV_CRSIS : TP.TPVSB.FSI.W.FSI_SLAVE.CMFSI_INCLUDE.MFSI_B.PIB2OPB.COMP.P#0.P.CRSIS PERV_PIB2OPB0_CRSIS : TP.TPVSB.FSI.W.FSI_SLAVE.CMFSI_INCLUDE.MFSI_A.PIB2OPB.COMP.P#0.P.CRSIS EQ_CSAR : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEARB.CSAR -EX_CSAR : TP.TCEP00.TPCL3.PPE.CME1.CME.CMEARB.CSAR +EX_CSAR : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEARB.CSAR PU_CSAR : IOO3.IOO_PPE.PPE.ARB.ARB.CSAR XBUS_IOPPE_CSAR : IOFPPE.PPE.ARB.ARB.CSAR EQ_CSCR : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEARB.CSCR -EX_CSCR : TP.TCEP00.TPCL3.PPE.CME1.CME.CMEARB.CSCR +EX_CSCR : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEARB.CSCR PU_CSCR : IOO3.IOO_PPE.PPE.ARB.ARB.CSCR XBUS_IOPPE_CSCR : IOFPPE.PPE.ARB.ARB.CSCR EQ_CSDR : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEARB.CSDR -EX_CSDR : TP.TCEP00.TPCL3.PPE.CME1.CME.CMEARB.CSDR +EX_CSDR : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEARB.CSDR PU_CSDR : IOO3.IOO_PPE.PPE.ARB.ARB.CSDR XBUS_IOPPE_CSDR : IOFPPE.PPE.ARB.ARB.CSDR PU_NPU1_CTL_CTL_STATUS : NPU.STCK1.CS.CTL.MISC.CTL_STATUS @@ -4279,44 +4279,36 @@ PERV_HOST_MASK_REG : TP.TPCHIP.PIB.PCBMS.COMP.INTR_COMP.HOST_MASK_REG PU_HTM0_HTM_CFG : BRIDGE.NHTM.NHTM0.SC.HTM_CFG PU_HTM1_HTM_CFG : BRIDGE.NHTM.NHTM1.SC.HTM_CFG EQ_HTM_CTRL : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_CTRL -EX_CHTMLBS0_HTM_CTRL : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS0.CHTM.SC.HTM_CTRL +EX_HTM_CTRL : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_CTRL PU_HTM0_HTM_CTRL : BRIDGE.NHTM.NHTM0.SC.HTM_CTRL -EX_CHTMLBS1_HTM_CTRL : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS1.CHTM.SC.HTM_CTRL PU_HTM1_HTM_CTRL : BRIDGE.NHTM.NHTM1.SC.HTM_CTRL PU_HTM0_HTM_FILT : BRIDGE.NHTM.NHTM0.SC.HTM_FILT PU_HTM1_HTM_FILT : BRIDGE.NHTM.NHTM1.SC.HTM_FILT PU_HTM0_HTM_FLEX : BRIDGE.NHTM.NHTM0.SC.HTM_FLEX PU_HTM1_HTM_FLEX : BRIDGE.NHTM.NHTM1.SC.HTM_FLEX EQ_HTM_IMA_PDBAR : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_IMA_PDBAR -EX_CHTMLBS0_HTM_IMA_PDBAR : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS0.CHTM.SC.HTM_IMA_PDBAR -EX_CHTMLBS1_HTM_IMA_PDBAR : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS1.CHTM.SC.HTM_IMA_PDBAR +EX_HTM_IMA_PDBAR : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_IMA_PDBAR EQ_HTM_IMA_STATUS : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_IMA_STATUS -EX_CHTMLBS0_HTM_IMA_STATUS : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS0.CHTM.SC.HTM_IMA_STATUS -EX_CHTMLBS1_HTM_IMA_STATUS : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS1.CHTM.SC.HTM_IMA_STATUS +EX_HTM_IMA_STATUS : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_IMA_STATUS EQ_HTM_LAST : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_LAST -EX_CHTMLBS0_HTM_LAST : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS0.CHTM.SC.HTM_LAST +EX_HTM_LAST : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_LAST PU_HTM0_HTM_LAST : BRIDGE.NHTM.NHTM0.SC.HTM_LAST -EX_CHTMLBS1_HTM_LAST : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS1.CHTM.SC.HTM_LAST PU_HTM1_HTM_LAST : BRIDGE.NHTM.NHTM1.SC.HTM_LAST EQ_HTM_MEM : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_MEM -EX_CHTMLBS0_HTM_MEM : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS0.CHTM.SC.HTM_MEM +EX_HTM_MEM : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_MEM PU_HTM0_HTM_MEM : BRIDGE.NHTM.NHTM0.SC.HTM_MEM -EX_CHTMLBS1_HTM_MEM : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS1.CHTM.SC.HTM_MEM PU_HTM1_HTM_MEM : BRIDGE.NHTM.NHTM1.SC.HTM_MEM EQ_HTM_MODE : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_MODE -EX_CHTMLBS0_HTM_MODE : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS0.CHTM.SC.HTM_MODE +EX_HTM_MODE : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_MODE PU_HTM0_HTM_MODE : BRIDGE.NHTM.NHTM0.SC.HTM_MODE -EX_CHTMLBS1_HTM_MODE : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS1.CHTM.SC.HTM_MODE PU_HTM1_HTM_MODE : BRIDGE.NHTM.NHTM1.SC.HTM_MODE EQ_HTM_STAT : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_STAT -EX_CHTMLBS0_HTM_STAT : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS0.CHTM.SC.HTM_STAT +EX_HTM_STAT : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_STAT PU_HTM0_HTM_STAT : BRIDGE.NHTM.NHTM0.SC.HTM_STAT -EX_CHTMLBS1_HTM_STAT : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS1.CHTM.SC.HTM_STAT PU_HTM1_HTM_STAT : BRIDGE.NHTM.NHTM1.SC.HTM_STAT EQ_HTM_TRIG : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_TRIG -EX_CHTMLBS0_HTM_TRIG : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS0.CHTM.SC.HTM_TRIG +EX_HTM_TRIG : TP.TCEP00.TPCL3.PPE.CME0.CHTMLBS1.CHTM.SC.HTM_TRIG PU_HTM0_HTM_TRIG : BRIDGE.NHTM.NHTM0.SC.HTM_TRIG -EX_CHTMLBS1_HTM_TRIG : TP.TCEP00.TPCL3.PPE.CME1.CHTMLBS1.CHTM.SC.HTM_TRIG PU_HTM1_HTM_TRIG : BRIDGE.NHTM.NHTM1.SC.HTM_TRIG PU_HTM0_HTM_TTYPEFILT : BRIDGE.NHTM.NHTM0.SC.HTM_TTYPEFILT PU_HTM1_HTM_TTYPEFILT : BRIDGE.NHTM.NHTM1.SC.HTM_TTYPEFILT @@ -5192,15 +5184,15 @@ MCS_PORT13_MCWAT : MC01.PORT1.ATCL.CL.CLSCOM.MCWAT MCS_MCWATCNTL : MC01.PBI01.SCOMFIR.MCWATCNTL MCS_MCWATDATA : MC01.PBI01.SCOMFIR.MCWATDATA EQ_MIB_XIICAC : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.MIB.MIB_XIICAC -EX_MIB_XIICAC : TP.TCEP00.TPCL3.PPE.CME1.CME.CMEPPE.MIB.MIB_XIICAC +EX_MIB_XIICAC : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.MIB.MIB_XIICAC PU_MIB_XIICAC : IOO3.IOO_PPE.PPE.PPE.PPE.MIB.MIB_XIICAC XBUS_IOPPE_MIB_XIICAC : IOFPPE.PPE.PPE.PPE.MIB.MIB_XIICAC EQ_MIB_XIMEM : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.MIB.MIB_XIMEM -EX_MIB_XIMEM : TP.TCEP00.TPCL3.PPE.CME1.CME.CMEPPE.MIB.MIB_XIMEM +EX_MIB_XIMEM : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.MIB.MIB_XIMEM PU_MIB_XIMEM : IOO3.IOO_PPE.PPE.PPE.PPE.MIB.MIB_XIMEM XBUS_IOPPE_MIB_XIMEM : IOFPPE.PPE.PPE.PPE.MIB.MIB_XIMEM EQ_MIB_XISGB : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.MIB.MIB_XISGB -EX_MIB_XISGB : TP.TCEP00.TPCL3.PPE.CME1.CME.CMEPPE.MIB.MIB_XISGB +EX_MIB_XISGB : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.MIB.MIB_XISGB PU_MIB_XISGB : IOO3.IOO_PPE.PPE.PPE.PPE.MIB.MIB_XISGB XBUS_IOPPE_MIB_XISGB : IOFPPE.PPE.PPE.PPE.MIB.MIB_XISGB PU_MIB_XISIB : TP.TPCHIP.PIB.SBE.SBEPM.MIB_XISIB @@ -6182,27 +6174,27 @@ EX_L3_PM_LCO_DIS_REG : EX00.L3.L3_MISC.L3CERRS.PM_LCO_DIS_REG EQ_PM_PURGE_REG : EX01.L3.L3_MISC.L3CERRS.PM_PURGE_REG EX_L3_PM_PURGE_REG : EX00.L3.L3_MISC.L3CERRS.PM_PURGE_REG EQ_PPE_XIDBGPRO : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.PPE.PPE_XIDBGPRO -EX_PPE_XIDBGPRO : TP.TCEP00.TPCL3.PPE.CME1.CME.CMEPPE.PPE.PPE_XIDBGPRO +EX_PPE_XIDBGPRO : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.PPE.PPE_XIDBGPRO PU_PPE_XIDBGPRO : IOO3.IOO_PPE.PPE.PPE.PPE.PPE.PPE_XIDBGPRO XBUS_IOPPE_PPE_XIDBGPRO : IOFPPE.PPE.PPE.PPE.PPE.PPE_XIDBGPRO EQ_PPE_XIRAMDBG : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.PPE.PPE_XIRAMDBG -EX_PPE_XIRAMDBG : TP.TCEP00.TPCL3.PPE.CME1.CME.CMEPPE.PPE.PPE_XIRAMDBG +EX_PPE_XIRAMDBG : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.PPE.PPE_XIRAMDBG PU_PPE_XIRAMDBG : IOO3.IOO_PPE.PPE.PPE.PPE.PPE.PPE_XIRAMDBG XBUS_IOPPE_PPE_XIRAMDBG : IOFPPE.PPE.PPE.PPE.PPE.PPE_XIRAMDBG EQ_PPE_XIRAMEDR : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.PPE.PPE_XIRAMEDR -EX_PPE_XIRAMEDR : TP.TCEP00.TPCL3.PPE.CME1.CME.CMEPPE.PPE.PPE_XIRAMEDR +EX_PPE_XIRAMEDR : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.PPE.PPE_XIRAMEDR PU_PPE_XIRAMEDR : IOO3.IOO_PPE.PPE.PPE.PPE.PPE.PPE_XIRAMEDR XBUS_IOPPE_PPE_XIRAMEDR : IOFPPE.PPE.PPE.PPE.PPE.PPE_XIRAMEDR EQ_PPE_XIRAMGA : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.PPE.PPE_XIRAMGA -EX_PPE_XIRAMGA : TP.TCEP00.TPCL3.PPE.CME1.CME.CMEPPE.PPE.PPE_XIRAMGA +EX_PPE_XIRAMGA : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.PPE.PPE_XIRAMGA PU_PPE_XIRAMGA : IOO3.IOO_PPE.PPE.PPE.PPE.PPE.PPE_XIRAMGA XBUS_IOPPE_PPE_XIRAMGA : IOFPPE.PPE.PPE.PPE.PPE.PPE_XIRAMGA EQ_PPE_XIRAMRA : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.PPE.PPE_XIRAMRA -EX_PPE_XIRAMRA : TP.TCEP00.TPCL3.PPE.CME1.CME.CMEPPE.PPE.PPE_XIRAMRA +EX_PPE_XIRAMRA : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.PPE.PPE_XIRAMRA PU_PPE_XIRAMRA : IOO3.IOO_PPE.PPE.PPE.PPE.PPE.PPE_XIRAMRA XBUS_IOPPE_PPE_XIRAMRA : IOFPPE.PPE.PPE.PPE.PPE.PPE_XIRAMRA EQ_PPE_XIXCR : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.PPE.PPE_XIXCR -EX_PPE_XIXCR : TP.TCEP00.TPCL3.PPE.CME1.CME.CMEPPE.PPE.PPE_XIXCR +EX_PPE_XIXCR : TP.TCEP00.TPCL3.PPE.CME0.CME.CMEPPE.PPE.PPE_XIXCR PU_PPE_XIXCR : IOO3.IOO_PPE.PPE.PPE.PPE.PPE.PPE_XIXCR XBUS_IOPPE_PPE_XIXCR : IOFPPE.PPE.PPE.PPE.PPE.PPE_XIXCR EQ_PPM_CGCR : TP.TPCHIP.NET.PCBSLEP00.PPMQ.PPM_COMMON_REGS.PPM_CGCR @@ -10251,65 +10243,65 @@ PERV_1_TPCHIP_TRA0_TR1_TRACE_TRDATA_CONFIG_4 : TP.TPCHIP.TPC.TRA0.TR1.TRACE_TRDA PERV_1_TPCHIP_TRA0_TR1_TRACE_TRDATA_CONFIG_5 : TP.TPCHIP.TPC.TRA0.TR1.TRACE_TRDATA_CONFIG_5 PERV_1_TPCHIP_TRA0_TR1_TRACE_TRDATA_CONFIG_9 : TP.TPCHIP.TPC.TRA0.TR1.TRACE_TRDATA_CONFIG_9 EQ_TPLC20_TR0_TRACE_HI_DATA_REG : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_HI_DATA_REG +EX_TPLC20_TR0_TRACE_HI_DATA_REG : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_HI_DATA_REG EQ_TPLC20_TR0_TRACE_LO_DATA_REG : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_LO_DATA_REG +EX_TPLC20_TR0_TRACE_LO_DATA_REG : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_LO_DATA_REG EQ_TPLC20_TR0_TRACE_TRCTRL_CONFIG : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRCTRL_CONFIG +EX_TPLC20_TR0_TRACE_TRCTRL_CONFIG : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRCTRL_CONFIG EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRDATA_CONFIG_0 +EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_0 : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRDATA_CONFIG_0 EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRDATA_CONFIG_1 +EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_1 : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRDATA_CONFIG_1 EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRDATA_CONFIG_2 +EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_2 : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRDATA_CONFIG_2 EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRDATA_CONFIG_3 +EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_3 : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRDATA_CONFIG_3 EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRDATA_CONFIG_4 +EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_4 : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRDATA_CONFIG_4 EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRDATA_CONFIG_5 +EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_5 : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRDATA_CONFIG_5 EQ_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRDATA_CONFIG_9 +EX_TPLC20_TR0_TRACE_TRDATA_CONFIG_9 : TP.TCEP00.TPCL20.L2TRA0.TR0.TRACE_TRDATA_CONFIG_9 EQ_TPLC20_TR1_TRACE_HI_DATA_REG : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_HI_DATA_REG +EX_TPLC20_TR1_TRACE_HI_DATA_REG : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_HI_DATA_REG EQ_TPLC20_TR1_TRACE_LO_DATA_REG : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_LO_DATA_REG +EX_TPLC20_TR1_TRACE_LO_DATA_REG : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_LO_DATA_REG EQ_TPLC20_TR1_TRACE_TRCTRL_CONFIG : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRCTRL_CONFIG +EX_TPLC20_TR1_TRACE_TRCTRL_CONFIG : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRCTRL_CONFIG EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRDATA_CONFIG_0 +EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_0 : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRDATA_CONFIG_0 EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRDATA_CONFIG_1 +EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_1 : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRDATA_CONFIG_1 EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRDATA_CONFIG_2 +EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_2 : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRDATA_CONFIG_2 EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRDATA_CONFIG_3 +EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_3 : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRDATA_CONFIG_3 EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRDATA_CONFIG_4 +EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_4 : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRDATA_CONFIG_4 EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRDATA_CONFIG_5 +EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_5 : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRDATA_CONFIG_5 EQ_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRDATA_CONFIG_9 +EX_TPLC20_TR1_TRACE_TRDATA_CONFIG_9 : TP.TCEP00.TPCL20.L2TRA0.TR1.TRACE_TRDATA_CONFIG_9 EQ_TPLC21_TR0_TRACE_HI_DATA_REG : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_HI_DATA_REG -EX_TPLC21_TR0_TRACE_HI_DATA_REG : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_HI_DATA_REG EQ_TPLC21_TR0_TRACE_LO_DATA_REG : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_LO_DATA_REG -EX_TPLC21_TR0_TRACE_LO_DATA_REG : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_LO_DATA_REG EQ_TPLC21_TR0_TRACE_TRCTRL_CONFIG : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRCTRL_CONFIG -EX_TPLC21_TR0_TRACE_TRCTRL_CONFIG : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRCTRL_CONFIG EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRDATA_CONFIG_0 -EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_0 : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRDATA_CONFIG_0 EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRDATA_CONFIG_1 -EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_1 : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRDATA_CONFIG_1 EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRDATA_CONFIG_2 -EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_2 : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRDATA_CONFIG_2 EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRDATA_CONFIG_3 -EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_3 : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRDATA_CONFIG_3 EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRDATA_CONFIG_4 -EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_4 : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRDATA_CONFIG_4 EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRDATA_CONFIG_5 -EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_5 : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRDATA_CONFIG_5 EQ_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRDATA_CONFIG_9 -EX_TPLC21_TR0_TRACE_TRDATA_CONFIG_9 : TP.TCEP00.TPCL21.L2TRA0.TR0.TRACE_TRDATA_CONFIG_9 EQ_TPLC21_TR1_TRACE_HI_DATA_REG : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_HI_DATA_REG -EX_TPLC21_TR1_TRACE_HI_DATA_REG : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_HI_DATA_REG EQ_TPLC21_TR1_TRACE_LO_DATA_REG : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_LO_DATA_REG -EX_TPLC21_TR1_TRACE_LO_DATA_REG : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_LO_DATA_REG EQ_TPLC21_TR1_TRACE_TRCTRL_CONFIG : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRCTRL_CONFIG -EX_TPLC21_TR1_TRACE_TRCTRL_CONFIG : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRCTRL_CONFIG EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRDATA_CONFIG_0 -EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_0 : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRDATA_CONFIG_0 EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRDATA_CONFIG_1 -EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_1 : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRDATA_CONFIG_1 EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRDATA_CONFIG_2 -EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_2 : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRDATA_CONFIG_2 EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRDATA_CONFIG_3 -EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_3 : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRDATA_CONFIG_3 EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRDATA_CONFIG_4 -EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_4 : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRDATA_CONFIG_4 EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRDATA_CONFIG_5 -EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_5 : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRDATA_CONFIG_5 EQ_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRDATA_CONFIG_9 -EX_TPLC21_TR1_TRACE_TRDATA_CONFIG_9 : TP.TCEP00.TPCL21.L2TRA0.TR1.TRACE_TRDATA_CONFIG_9 PERV_FSI2PIB_TRUE_MASK : TP.TPVSB.FSI.W.FSI2PIB.TRUE_MASK PERV_FSISHIFT_TRUE_MASK : TP.TPVSB.FSI.W.FSI_SHIFT.TRUE_MASK PU_TRUST_CONTROL : BRIDGE.PSIHB.TRUST_CONTROL diff --git a/import/chips/p9/common/include/p9_scom_template_consts.H b/import/chips/p9/common/include/p9_scom_template_consts.H index 102fee2d..29c94435 100644 --- a/import/chips/p9/common/include/p9_scom_template_consts.H +++ b/import/chips/p9/common/include/p9_scom_template_consts.H @@ -73,256 +73,254 @@ static const uint64_t SH_UNT_EQ_4 = 34; static const uint64_t SH_UNT_EQ_5 = 35; static const uint64_t SH_UNT_EX = 36; static const uint64_t SH_UNT_EX_0 = 37; -static const uint64_t SH_UNT_EX_0_CHTMLBS0 = 38; -static const uint64_t SH_UNT_EX_0_CHTMLBS1 = 39; -static const uint64_t SH_UNT_EX_0_L2 = 40; -static const uint64_t SH_UNT_EX_0_L3 = 41; -static const uint64_t SH_UNT_EX_1 = 42; -static const uint64_t SH_UNT_EX_10 = 43; -static const uint64_t SH_UNT_EX_10_CHTMLBS0 = 44; -static const uint64_t SH_UNT_EX_10_CHTMLBS1 = 45; -static const uint64_t SH_UNT_EX_10_L2 = 46; -static const uint64_t SH_UNT_EX_10_L3 = 47; -static const uint64_t SH_UNT_EX_11 = 48; -static const uint64_t SH_UNT_EX_11_L2 = 49; -static const uint64_t SH_UNT_EX_11_L3 = 50; +static const uint64_t SH_UNT_EX_0_L2 = 38; +static const uint64_t SH_UNT_EX_0_L3 = 39; +static const uint64_t SH_UNT_EX_1 = 40; +static const uint64_t SH_UNT_EX_10 = 41; +static const uint64_t SH_UNT_EX_10_L2 = 42; +static const uint64_t SH_UNT_EX_10_L3 = 43; +static const uint64_t SH_UNT_EX_11 = 44; +static const uint64_t SH_UNT_EX_11_CHTMLBS0 = 45; +static const uint64_t SH_UNT_EX_11_CHTMLBS1 = 46; +static const uint64_t SH_UNT_EX_11_L2 = 47; +static const uint64_t SH_UNT_EX_11_L3 = 48; +static const uint64_t SH_UNT_EX_1_CHTMLBS0 = 49; +static const uint64_t SH_UNT_EX_1_CHTMLBS1 = 50; static const uint64_t SH_UNT_EX_1_L2 = 51; static const uint64_t SH_UNT_EX_1_L3 = 52; static const uint64_t SH_UNT_EX_2 = 53; -static const uint64_t SH_UNT_EX_2_CHTMLBS0 = 54; -static const uint64_t SH_UNT_EX_2_CHTMLBS1 = 55; -static const uint64_t SH_UNT_EX_2_L2 = 56; -static const uint64_t SH_UNT_EX_2_L3 = 57; -static const uint64_t SH_UNT_EX_3 = 58; +static const uint64_t SH_UNT_EX_2_L2 = 54; +static const uint64_t SH_UNT_EX_2_L3 = 55; +static const uint64_t SH_UNT_EX_3 = 56; +static const uint64_t SH_UNT_EX_3_CHTMLBS0 = 57; +static const uint64_t SH_UNT_EX_3_CHTMLBS1 = 58; static const uint64_t SH_UNT_EX_3_L2 = 59; static const uint64_t SH_UNT_EX_3_L3 = 60; static const uint64_t SH_UNT_EX_4 = 61; -static const uint64_t SH_UNT_EX_4_CHTMLBS0 = 62; -static const uint64_t SH_UNT_EX_4_CHTMLBS1 = 63; -static const uint64_t SH_UNT_EX_4_L2 = 64; -static const uint64_t SH_UNT_EX_4_L3 = 65; -static const uint64_t SH_UNT_EX_5 = 66; +static const uint64_t SH_UNT_EX_4_L2 = 62; +static const uint64_t SH_UNT_EX_4_L3 = 63; +static const uint64_t SH_UNT_EX_5 = 64; +static const uint64_t SH_UNT_EX_5_CHTMLBS0 = 65; +static const uint64_t SH_UNT_EX_5_CHTMLBS1 = 66; static const uint64_t SH_UNT_EX_5_L2 = 67; static const uint64_t SH_UNT_EX_5_L3 = 68; static const uint64_t SH_UNT_EX_6 = 69; -static const uint64_t SH_UNT_EX_6_CHTMLBS0 = 70; -static const uint64_t SH_UNT_EX_6_CHTMLBS1 = 71; -static const uint64_t SH_UNT_EX_6_L2 = 72; -static const uint64_t SH_UNT_EX_6_L3 = 73; -static const uint64_t SH_UNT_EX_7 = 74; +static const uint64_t SH_UNT_EX_6_L2 = 70; +static const uint64_t SH_UNT_EX_6_L3 = 71; +static const uint64_t SH_UNT_EX_7 = 72; +static const uint64_t SH_UNT_EX_7_CHTMLBS0 = 73; +static const uint64_t SH_UNT_EX_7_CHTMLBS1 = 74; static const uint64_t SH_UNT_EX_7_L2 = 75; static const uint64_t SH_UNT_EX_7_L3 = 76; static const uint64_t SH_UNT_EX_8 = 77; -static const uint64_t SH_UNT_EX_8_CHTMLBS0 = 78; -static const uint64_t SH_UNT_EX_8_CHTMLBS1 = 79; -static const uint64_t SH_UNT_EX_8_L2 = 80; -static const uint64_t SH_UNT_EX_8_L3 = 81; -static const uint64_t SH_UNT_EX_9 = 82; +static const uint64_t SH_UNT_EX_8_L2 = 78; +static const uint64_t SH_UNT_EX_8_L3 = 79; +static const uint64_t SH_UNT_EX_9 = 80; +static const uint64_t SH_UNT_EX_9_CHTMLBS0 = 81; +static const uint64_t SH_UNT_EX_9_CHTMLBS1 = 82; static const uint64_t SH_UNT_EX_9_L2 = 83; static const uint64_t SH_UNT_EX_9_L3 = 84; -static const uint64_t SH_UNT_EX_CHTMLBS0 = 85; -static const uint64_t SH_UNT_EX_CHTMLBS1 = 86; -static const uint64_t SH_UNT_EX_L2 = 87; -static const uint64_t SH_UNT_EX_L3 = 88; -static const uint64_t SH_UNT_MCA = 89; -static const uint64_t SH_UNT_MCA_0 = 90; -static const uint64_t SH_UNT_MCA_0_WDF = 91; -static const uint64_t SH_UNT_MCA_0_WREITE = 92; -static const uint64_t SH_UNT_MCA_1 = 93; -static const uint64_t SH_UNT_MCA_1_WDF = 94; -static const uint64_t SH_UNT_MCA_1_WREITE = 95; -static const uint64_t SH_UNT_MCA_2 = 96; -static const uint64_t SH_UNT_MCA_2_WDF = 97; -static const uint64_t SH_UNT_MCA_2_WREITE = 98; -static const uint64_t SH_UNT_MCA_3 = 99; -static const uint64_t SH_UNT_MCA_3_WDF = 100; -static const uint64_t SH_UNT_MCA_3_WREITE = 101; -static const uint64_t SH_UNT_MCA_4 = 102; -static const uint64_t SH_UNT_MCA_4_WDF = 103; -static const uint64_t SH_UNT_MCA_4_WREITE = 104; -static const uint64_t SH_UNT_MCA_5 = 105; -static const uint64_t SH_UNT_MCA_5_WDF = 106; -static const uint64_t SH_UNT_MCA_5_WREITE = 107; -static const uint64_t SH_UNT_MCA_6 = 108; -static const uint64_t SH_UNT_MCA_6_WDF = 109; -static const uint64_t SH_UNT_MCA_6_WREITE = 110; -static const uint64_t SH_UNT_MCA_7 = 111; -static const uint64_t SH_UNT_MCA_7_WDF = 112; -static const uint64_t SH_UNT_MCA_7_WREITE = 113; -static const uint64_t SH_UNT_MCA_WDF = 114; -static const uint64_t SH_UNT_MCA_WREITE = 115; -static const uint64_t SH_UNT_MCBIST = 116; -static const uint64_t SH_UNT_MCBIST_0 = 117; -static const uint64_t SH_UNT_MCBIST_1 = 118; -static const uint64_t SH_UNT_MCS = 119; -static const uint64_t SH_UNT_MCS_0 = 120; -static const uint64_t SH_UNT_MCS_0_PORT02 = 121; -static const uint64_t SH_UNT_MCS_0_PORT13 = 122; -static const uint64_t SH_UNT_MCS_1 = 123; -static const uint64_t SH_UNT_MCS_1_PORT02 = 124; -static const uint64_t SH_UNT_MCS_1_PORT13 = 125; -static const uint64_t SH_UNT_MCS_2 = 126; -static const uint64_t SH_UNT_MCS_2_PORT02 = 127; -static const uint64_t SH_UNT_MCS_2_PORT13 = 128; -static const uint64_t SH_UNT_MCS_3 = 129; -static const uint64_t SH_UNT_MCS_3_PORT02 = 130; -static const uint64_t SH_UNT_MCS_3_PORT13 = 131; -static const uint64_t SH_UNT_MCS_PORT02 = 132; -static const uint64_t SH_UNT_MCS_PORT13 = 133; -static const uint64_t SH_UNT_NV = 134; -static const uint64_t SH_UNT_NV_0 = 135; -static const uint64_t SH_UNT_NV_1 = 136; -static const uint64_t SH_UNT_NV_2 = 137; -static const uint64_t SH_UNT_NV_3 = 138; -static const uint64_t SH_UNT_OBUS = 139; -static const uint64_t SH_UNT_OBUS_0 = 140; -static const uint64_t SH_UNT_OBUS_3 = 141; -static const uint64_t SH_UNT_PEC = 142; -static const uint64_t SH_UNT_PEC_0 = 143; -static const uint64_t SH_UNT_PEC_0_STACK0 = 144; -static const uint64_t SH_UNT_PEC_0_STACK1 = 145; -static const uint64_t SH_UNT_PEC_0_STACK2 = 146; -static const uint64_t SH_UNT_PEC_1 = 147; -static const uint64_t SH_UNT_PEC_1_STACK0 = 148; -static const uint64_t SH_UNT_PEC_1_STACK1 = 149; -static const uint64_t SH_UNT_PEC_1_STACK2 = 150; -static const uint64_t SH_UNT_PEC_2 = 151; -static const uint64_t SH_UNT_PEC_2_STACK0 = 152; -static const uint64_t SH_UNT_PEC_2_STACK1 = 153; -static const uint64_t SH_UNT_PEC_2_STACK2 = 154; -static const uint64_t SH_UNT_PEC_STACK0 = 155; -static const uint64_t SH_UNT_PEC_STACK1 = 156; -static const uint64_t SH_UNT_PEC_STACK2 = 157; -static const uint64_t SH_UNT_PERV = 158; -static const uint64_t SH_UNT_PERV_0 = 159; -static const uint64_t SH_UNT_PERV_0_FSII2C = 160; -static const uint64_t SH_UNT_PERV_0_PIB2OPB0 = 161; -static const uint64_t SH_UNT_PERV_0_PIB2OPB1 = 162; -static const uint64_t SH_UNT_PERV_1 = 163; -static const uint64_t SH_UNT_PERV_12 = 164; -static const uint64_t SH_UNT_PERV_13 = 165; -static const uint64_t SH_UNT_PERV_14 = 166; -static const uint64_t SH_UNT_PERV_15 = 167; -static const uint64_t SH_UNT_PERV_16 = 168; -static const uint64_t SH_UNT_PERV_17 = 169; -static const uint64_t SH_UNT_PERV_18 = 170; -static const uint64_t SH_UNT_PERV_19 = 171; -static const uint64_t SH_UNT_PERV_2 = 172; -static const uint64_t SH_UNT_PERV_20 = 173; -static const uint64_t SH_UNT_PERV_21 = 174; -static const uint64_t SH_UNT_PERV_3 = 175; -static const uint64_t SH_UNT_PERV_32 = 176; -static const uint64_t SH_UNT_PERV_33 = 177; -static const uint64_t SH_UNT_PERV_34 = 178; -static const uint64_t SH_UNT_PERV_35 = 179; -static const uint64_t SH_UNT_PERV_36 = 180; -static const uint64_t SH_UNT_PERV_37 = 181; -static const uint64_t SH_UNT_PERV_38 = 182; -static const uint64_t SH_UNT_PERV_39 = 183; -static const uint64_t SH_UNT_PERV_4 = 184; -static const uint64_t SH_UNT_PERV_40 = 185; -static const uint64_t SH_UNT_PERV_41 = 186; -static const uint64_t SH_UNT_PERV_42 = 187; -static const uint64_t SH_UNT_PERV_43 = 188; -static const uint64_t SH_UNT_PERV_44 = 189; -static const uint64_t SH_UNT_PERV_45 = 190; -static const uint64_t SH_UNT_PERV_46 = 191; -static const uint64_t SH_UNT_PERV_47 = 192; -static const uint64_t SH_UNT_PERV_48 = 193; -static const uint64_t SH_UNT_PERV_49 = 194; -static const uint64_t SH_UNT_PERV_5 = 195; -static const uint64_t SH_UNT_PERV_50 = 196; -static const uint64_t SH_UNT_PERV_51 = 197; -static const uint64_t SH_UNT_PERV_52 = 198; -static const uint64_t SH_UNT_PERV_53 = 199; -static const uint64_t SH_UNT_PERV_54 = 200; -static const uint64_t SH_UNT_PERV_55 = 201; -static const uint64_t SH_UNT_PERV_6 = 202; -static const uint64_t SH_UNT_PERV_7 = 203; -static const uint64_t SH_UNT_PERV_8 = 204; -static const uint64_t SH_UNT_PERV_9 = 205; -static const uint64_t SH_UNT_PERV_FSB = 206; -static const uint64_t SH_UNT_PERV_FSI2PIB = 207; -static const uint64_t SH_UNT_PERV_FSII2C = 208; -static const uint64_t SH_UNT_PERV_FSISHIFT = 209; -static const uint64_t SH_UNT_PERV_PIB2OPB0 = 210; -static const uint64_t SH_UNT_PERV_PIB2OPB1 = 211; -static const uint64_t SH_UNT_PHB = 212; -static const uint64_t SH_UNT_PHB_0 = 213; -static const uint64_t SH_UNT_PHB_1 = 214; -static const uint64_t SH_UNT_PHB_2 = 215; -static const uint64_t SH_UNT_PHB_3 = 216; -static const uint64_t SH_UNT_PHB_4 = 217; -static const uint64_t SH_UNT_PHB_5 = 218; -static const uint64_t SH_UNT_PU_CME0 = 219; -static const uint64_t SH_UNT_PU_CME1 = 220; -static const uint64_t SH_UNT_PU_CME10 = 221; -static const uint64_t SH_UNT_PU_CME11 = 222; -static const uint64_t SH_UNT_PU_CME2 = 223; -static const uint64_t SH_UNT_PU_CME3 = 224; -static const uint64_t SH_UNT_PU_CME4 = 225; -static const uint64_t SH_UNT_PU_CME5 = 226; -static const uint64_t SH_UNT_PU_CME6 = 227; -static const uint64_t SH_UNT_PU_CME7 = 228; -static const uint64_t SH_UNT_PU_CME8 = 229; -static const uint64_t SH_UNT_PU_CME9 = 230; -static const uint64_t SH_UNT_PU_HTM0 = 231; -static const uint64_t SH_UNT_PU_HTM1 = 232; -static const uint64_t SH_UNT_PU_IOE = 233; -static const uint64_t SH_UNT_PU_MCD1 = 234; -static const uint64_t SH_UNT_PU_N0 = 235; -static const uint64_t SH_UNT_PU_N1 = 236; -static const uint64_t SH_UNT_PU_N2 = 237; -static const uint64_t SH_UNT_PU_N3 = 238; -static const uint64_t SH_UNT_PU_NMMU = 239; -static const uint64_t SH_UNT_PU_NPU = 240; -static const uint64_t SH_UNT_PU_NPU0 = 241; -static const uint64_t SH_UNT_PU_NPU0_CTL = 242; -static const uint64_t SH_UNT_PU_NPU0_DAT = 243; -static const uint64_t SH_UNT_PU_NPU0_SM0 = 244; -static const uint64_t SH_UNT_PU_NPU0_SM1 = 245; -static const uint64_t SH_UNT_PU_NPU0_SM2 = 246; -static const uint64_t SH_UNT_PU_NPU0_SM3 = 247; -static const uint64_t SH_UNT_PU_NPU1 = 248; -static const uint64_t SH_UNT_PU_NPU1_CTL = 249; -static const uint64_t SH_UNT_PU_NPU1_DAT = 250; -static const uint64_t SH_UNT_PU_NPU1_SM0 = 251; -static const uint64_t SH_UNT_PU_NPU1_SM1 = 252; -static const uint64_t SH_UNT_PU_NPU1_SM2 = 253; -static const uint64_t SH_UNT_PU_NPU1_SM3 = 254; -static const uint64_t SH_UNT_PU_NPU2 = 255; -static const uint64_t SH_UNT_PU_NPU2_CTL = 256; -static const uint64_t SH_UNT_PU_NPU2_DAT = 257; -static const uint64_t SH_UNT_PU_NPU2_NTL0 = 258; -static const uint64_t SH_UNT_PU_NPU2_NTL1 = 259; -static const uint64_t SH_UNT_PU_NPU2_SM0 = 260; -static const uint64_t SH_UNT_PU_NPU2_SM1 = 261; -static const uint64_t SH_UNT_PU_NPU2_SM2 = 262; -static const uint64_t SH_UNT_PU_NPU2_SM3 = 263; -static const uint64_t SH_UNT_PU_NPU_CTL = 264; -static const uint64_t SH_UNT_PU_NPU_DAT = 265; -static const uint64_t SH_UNT_PU_NPU_MSC_SM0 = 266; -static const uint64_t SH_UNT_PU_NPU_MSC_SM2 = 267; -static const uint64_t SH_UNT_PU_NPU_NTL0 = 268; -static const uint64_t SH_UNT_PU_NPU_NTL1 = 269; -static const uint64_t SH_UNT_PU_NPU_SM0 = 270; -static const uint64_t SH_UNT_PU_NPU_SM1 = 271; -static const uint64_t SH_UNT_PU_NPU_SM2 = 272; -static const uint64_t SH_UNT_PU_NPU_SM3 = 273; -static const uint64_t SH_UNT_PU_OTPROM0 = 274; -static const uint64_t SH_UNT_PU_OTPROM1 = 275; -static const uint64_t SH_UNT_PU_PBAIB_STACK1 = 276; -static const uint64_t SH_UNT_PU_PBAIB_STACK2 = 277; -static const uint64_t SH_UNT_PU_PBAIB_STACK5 = 278; -static const uint64_t SH_UNT_PU_PB_CENT_SM0 = 279; -static const uint64_t SH_UNT_PU_PB_CENT_SM1 = 280; -static const uint64_t SH_UNT_PU_PB_WEST_SM0 = 281; -static const uint64_t SH_UNT_XBUS = 282; -static const uint64_t SH_UNT_XBUS_0 = 283; -static const uint64_t SH_UNT_XBUS_1 = 284; -static const uint64_t SH_UNT_XBUS_2 = 285; -static const uint64_t SH_UNT_XBUS_IOPPE = 286; -static const uint64_t SH_UNT_XBUS_PERV = 287; +static const uint64_t SH_UNT_EX_L2 = 85; +static const uint64_t SH_UNT_EX_L3 = 86; +static const uint64_t SH_UNT_MCA = 87; +static const uint64_t SH_UNT_MCA_0 = 88; +static const uint64_t SH_UNT_MCA_0_WDF = 89; +static const uint64_t SH_UNT_MCA_0_WREITE = 90; +static const uint64_t SH_UNT_MCA_1 = 91; +static const uint64_t SH_UNT_MCA_1_WDF = 92; +static const uint64_t SH_UNT_MCA_1_WREITE = 93; +static const uint64_t SH_UNT_MCA_2 = 94; +static const uint64_t SH_UNT_MCA_2_WDF = 95; +static const uint64_t SH_UNT_MCA_2_WREITE = 96; +static const uint64_t SH_UNT_MCA_3 = 97; +static const uint64_t SH_UNT_MCA_3_WDF = 98; +static const uint64_t SH_UNT_MCA_3_WREITE = 99; +static const uint64_t SH_UNT_MCA_4 = 100; +static const uint64_t SH_UNT_MCA_4_WDF = 101; +static const uint64_t SH_UNT_MCA_4_WREITE = 102; +static const uint64_t SH_UNT_MCA_5 = 103; +static const uint64_t SH_UNT_MCA_5_WDF = 104; +static const uint64_t SH_UNT_MCA_5_WREITE = 105; +static const uint64_t SH_UNT_MCA_6 = 106; +static const uint64_t SH_UNT_MCA_6_WDF = 107; +static const uint64_t SH_UNT_MCA_6_WREITE = 108; +static const uint64_t SH_UNT_MCA_7 = 109; +static const uint64_t SH_UNT_MCA_7_WDF = 110; +static const uint64_t SH_UNT_MCA_7_WREITE = 111; +static const uint64_t SH_UNT_MCA_WDF = 112; +static const uint64_t SH_UNT_MCA_WREITE = 113; +static const uint64_t SH_UNT_MCBIST = 114; +static const uint64_t SH_UNT_MCBIST_0 = 115; +static const uint64_t SH_UNT_MCBIST_1 = 116; +static const uint64_t SH_UNT_MCS = 117; +static const uint64_t SH_UNT_MCS_0 = 118; +static const uint64_t SH_UNT_MCS_0_PORT02 = 119; +static const uint64_t SH_UNT_MCS_0_PORT13 = 120; +static const uint64_t SH_UNT_MCS_1 = 121; +static const uint64_t SH_UNT_MCS_1_PORT02 = 122; +static const uint64_t SH_UNT_MCS_1_PORT13 = 123; +static const uint64_t SH_UNT_MCS_2 = 124; +static const uint64_t SH_UNT_MCS_2_PORT02 = 125; +static const uint64_t SH_UNT_MCS_2_PORT13 = 126; +static const uint64_t SH_UNT_MCS_3 = 127; +static const uint64_t SH_UNT_MCS_3_PORT02 = 128; +static const uint64_t SH_UNT_MCS_3_PORT13 = 129; +static const uint64_t SH_UNT_MCS_PORT02 = 130; +static const uint64_t SH_UNT_MCS_PORT13 = 131; +static const uint64_t SH_UNT_NV = 132; +static const uint64_t SH_UNT_NV_0 = 133; +static const uint64_t SH_UNT_NV_1 = 134; +static const uint64_t SH_UNT_NV_2 = 135; +static const uint64_t SH_UNT_NV_3 = 136; +static const uint64_t SH_UNT_OBUS = 137; +static const uint64_t SH_UNT_OBUS_0 = 138; +static const uint64_t SH_UNT_OBUS_3 = 139; +static const uint64_t SH_UNT_PEC = 140; +static const uint64_t SH_UNT_PEC_0 = 141; +static const uint64_t SH_UNT_PEC_0_STACK0 = 142; +static const uint64_t SH_UNT_PEC_0_STACK1 = 143; +static const uint64_t SH_UNT_PEC_0_STACK2 = 144; +static const uint64_t SH_UNT_PEC_1 = 145; +static const uint64_t SH_UNT_PEC_1_STACK0 = 146; +static const uint64_t SH_UNT_PEC_1_STACK1 = 147; +static const uint64_t SH_UNT_PEC_1_STACK2 = 148; +static const uint64_t SH_UNT_PEC_2 = 149; +static const uint64_t SH_UNT_PEC_2_STACK0 = 150; +static const uint64_t SH_UNT_PEC_2_STACK1 = 151; +static const uint64_t SH_UNT_PEC_2_STACK2 = 152; +static const uint64_t SH_UNT_PEC_STACK0 = 153; +static const uint64_t SH_UNT_PEC_STACK1 = 154; +static const uint64_t SH_UNT_PEC_STACK2 = 155; +static const uint64_t SH_UNT_PERV = 156; +static const uint64_t SH_UNT_PERV_0 = 157; +static const uint64_t SH_UNT_PERV_0_FSII2C = 158; +static const uint64_t SH_UNT_PERV_0_PIB2OPB0 = 159; +static const uint64_t SH_UNT_PERV_0_PIB2OPB1 = 160; +static const uint64_t SH_UNT_PERV_1 = 161; +static const uint64_t SH_UNT_PERV_12 = 162; +static const uint64_t SH_UNT_PERV_13 = 163; +static const uint64_t SH_UNT_PERV_14 = 164; +static const uint64_t SH_UNT_PERV_15 = 165; +static const uint64_t SH_UNT_PERV_16 = 166; +static const uint64_t SH_UNT_PERV_17 = 167; +static const uint64_t SH_UNT_PERV_18 = 168; +static const uint64_t SH_UNT_PERV_19 = 169; +static const uint64_t SH_UNT_PERV_2 = 170; +static const uint64_t SH_UNT_PERV_20 = 171; +static const uint64_t SH_UNT_PERV_21 = 172; +static const uint64_t SH_UNT_PERV_3 = 173; +static const uint64_t SH_UNT_PERV_32 = 174; +static const uint64_t SH_UNT_PERV_33 = 175; +static const uint64_t SH_UNT_PERV_34 = 176; +static const uint64_t SH_UNT_PERV_35 = 177; +static const uint64_t SH_UNT_PERV_36 = 178; +static const uint64_t SH_UNT_PERV_37 = 179; +static const uint64_t SH_UNT_PERV_38 = 180; +static const uint64_t SH_UNT_PERV_39 = 181; +static const uint64_t SH_UNT_PERV_4 = 182; +static const uint64_t SH_UNT_PERV_40 = 183; +static const uint64_t SH_UNT_PERV_41 = 184; +static const uint64_t SH_UNT_PERV_42 = 185; +static const uint64_t SH_UNT_PERV_43 = 186; +static const uint64_t SH_UNT_PERV_44 = 187; +static const uint64_t SH_UNT_PERV_45 = 188; +static const uint64_t SH_UNT_PERV_46 = 189; +static const uint64_t SH_UNT_PERV_47 = 190; +static const uint64_t SH_UNT_PERV_48 = 191; +static const uint64_t SH_UNT_PERV_49 = 192; +static const uint64_t SH_UNT_PERV_5 = 193; +static const uint64_t SH_UNT_PERV_50 = 194; +static const uint64_t SH_UNT_PERV_51 = 195; +static const uint64_t SH_UNT_PERV_52 = 196; +static const uint64_t SH_UNT_PERV_53 = 197; +static const uint64_t SH_UNT_PERV_54 = 198; +static const uint64_t SH_UNT_PERV_55 = 199; +static const uint64_t SH_UNT_PERV_6 = 200; +static const uint64_t SH_UNT_PERV_7 = 201; +static const uint64_t SH_UNT_PERV_8 = 202; +static const uint64_t SH_UNT_PERV_9 = 203; +static const uint64_t SH_UNT_PERV_FSB = 204; +static const uint64_t SH_UNT_PERV_FSI2PIB = 205; +static const uint64_t SH_UNT_PERV_FSII2C = 206; +static const uint64_t SH_UNT_PERV_FSISHIFT = 207; +static const uint64_t SH_UNT_PERV_PIB2OPB0 = 208; +static const uint64_t SH_UNT_PERV_PIB2OPB1 = 209; +static const uint64_t SH_UNT_PHB = 210; +static const uint64_t SH_UNT_PHB_0 = 211; +static const uint64_t SH_UNT_PHB_1 = 212; +static const uint64_t SH_UNT_PHB_2 = 213; +static const uint64_t SH_UNT_PHB_3 = 214; +static const uint64_t SH_UNT_PHB_4 = 215; +static const uint64_t SH_UNT_PHB_5 = 216; +static const uint64_t SH_UNT_PU_CME0 = 217; +static const uint64_t SH_UNT_PU_CME1 = 218; +static const uint64_t SH_UNT_PU_CME10 = 219; +static const uint64_t SH_UNT_PU_CME11 = 220; +static const uint64_t SH_UNT_PU_CME2 = 221; +static const uint64_t SH_UNT_PU_CME3 = 222; +static const uint64_t SH_UNT_PU_CME4 = 223; +static const uint64_t SH_UNT_PU_CME5 = 224; +static const uint64_t SH_UNT_PU_CME6 = 225; +static const uint64_t SH_UNT_PU_CME7 = 226; +static const uint64_t SH_UNT_PU_CME8 = 227; +static const uint64_t SH_UNT_PU_CME9 = 228; +static const uint64_t SH_UNT_PU_HTM0 = 229; +static const uint64_t SH_UNT_PU_HTM1 = 230; +static const uint64_t SH_UNT_PU_IOE = 231; +static const uint64_t SH_UNT_PU_MCD1 = 232; +static const uint64_t SH_UNT_PU_N0 = 233; +static const uint64_t SH_UNT_PU_N1 = 234; +static const uint64_t SH_UNT_PU_N2 = 235; +static const uint64_t SH_UNT_PU_N3 = 236; +static const uint64_t SH_UNT_PU_NMMU = 237; +static const uint64_t SH_UNT_PU_NPU = 238; +static const uint64_t SH_UNT_PU_NPU0 = 239; +static const uint64_t SH_UNT_PU_NPU0_CTL = 240; +static const uint64_t SH_UNT_PU_NPU0_DAT = 241; +static const uint64_t SH_UNT_PU_NPU0_SM0 = 242; +static const uint64_t SH_UNT_PU_NPU0_SM1 = 243; +static const uint64_t SH_UNT_PU_NPU0_SM2 = 244; +static const uint64_t SH_UNT_PU_NPU0_SM3 = 245; +static const uint64_t SH_UNT_PU_NPU1 = 246; +static const uint64_t SH_UNT_PU_NPU1_CTL = 247; +static const uint64_t SH_UNT_PU_NPU1_DAT = 248; +static const uint64_t SH_UNT_PU_NPU1_SM0 = 249; +static const uint64_t SH_UNT_PU_NPU1_SM1 = 250; +static const uint64_t SH_UNT_PU_NPU1_SM2 = 251; +static const uint64_t SH_UNT_PU_NPU1_SM3 = 252; +static const uint64_t SH_UNT_PU_NPU2 = 253; +static const uint64_t SH_UNT_PU_NPU2_CTL = 254; +static const uint64_t SH_UNT_PU_NPU2_DAT = 255; +static const uint64_t SH_UNT_PU_NPU2_NTL0 = 256; +static const uint64_t SH_UNT_PU_NPU2_NTL1 = 257; +static const uint64_t SH_UNT_PU_NPU2_SM0 = 258; +static const uint64_t SH_UNT_PU_NPU2_SM1 = 259; +static const uint64_t SH_UNT_PU_NPU2_SM2 = 260; +static const uint64_t SH_UNT_PU_NPU2_SM3 = 261; +static const uint64_t SH_UNT_PU_NPU_CTL = 262; +static const uint64_t SH_UNT_PU_NPU_DAT = 263; +static const uint64_t SH_UNT_PU_NPU_MSC_SM0 = 264; +static const uint64_t SH_UNT_PU_NPU_MSC_SM2 = 265; +static const uint64_t SH_UNT_PU_NPU_NTL0 = 266; +static const uint64_t SH_UNT_PU_NPU_NTL1 = 267; +static const uint64_t SH_UNT_PU_NPU_SM0 = 268; +static const uint64_t SH_UNT_PU_NPU_SM1 = 269; +static const uint64_t SH_UNT_PU_NPU_SM2 = 270; +static const uint64_t SH_UNT_PU_NPU_SM3 = 271; +static const uint64_t SH_UNT_PU_OTPROM0 = 272; +static const uint64_t SH_UNT_PU_OTPROM1 = 273; +static const uint64_t SH_UNT_PU_PBAIB_STACK1 = 274; +static const uint64_t SH_UNT_PU_PBAIB_STACK2 = 275; +static const uint64_t SH_UNT_PU_PBAIB_STACK5 = 276; +static const uint64_t SH_UNT_PU_PB_CENT_SM0 = 277; +static const uint64_t SH_UNT_PU_PB_CENT_SM1 = 278; +static const uint64_t SH_UNT_PU_PB_WEST_SM0 = 279; +static const uint64_t SH_UNT_XBUS = 280; +static const uint64_t SH_UNT_XBUS_0 = 281; +static const uint64_t SH_UNT_XBUS_1 = 282; +static const uint64_t SH_UNT_XBUS_2 = 283; +static const uint64_t SH_UNT_XBUS_IOPPE = 284; +static const uint64_t SH_UNT_XBUS_PERV = 285; static const uint64_t SH_ACS_FSI = 0; |
