Modify initCompiler to use template version of buffer insert

Change-Id: Ib2e652ad78971ac12084ce1053101c081c34b590
RTC:165584
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/33566
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/33568
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

5 files changed, 100 insertions, 100 deletions

diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C
index 716db93f..605d8d8d 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C
@@ -29,9 +29,9 @@
 
 using namespace fapi2;
 
-constexpr auto literal_0x4301D70000AB7696 = 0x4301D70000AB7696;
-constexpr auto literal_0x0000000000000000 = 0x0000000000000000;
-constexpr auto literal_0xA858009775100008 = 0xA858009775100008;
+constexpr uint64_t literal_0x4301D70000AB7696 = 0x4301D70000AB7696;
+constexpr uint64_t literal_0x0000000000000000 = 0x0000000000000000;
+constexpr uint64_t literal_0xA858009775100008 = 0xA858009775100008;
 
 fapi2::ReturnCode p9_core_scom(const fapi2::Target<fapi2::TARGET_TYPE_CORE>& TGT0)
 {
@@ -40,19 +40,19 @@ fapi2::ReturnCode p9_core_scom(const fapi2::Target<fapi2::TARGET_TYPE_CORE>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x20010a43ull, l_scom_buffer ));
 
-            l_scom_buffer.insert<uint64_t> (literal_0x4301D70000AB7696, 0, 64, 0 );
+            l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x4301D70000AB7696 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x20010a43ull, l_scom_buffer));
         }
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x20010a46ull, l_scom_buffer ));
 
-            l_scom_buffer.insert<uint64_t> (literal_0x0000000000000000, 0, 64, 0 );
+            l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x0000000000000000 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x20010a46ull, l_scom_buffer));
         }
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x20010a47ull, l_scom_buffer ));
 
-            l_scom_buffer.insert<uint64_t> (literal_0xA858009775100008, 0, 64, 0 );
+            l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0xA858009775100008 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x20010a47ull, l_scom_buffer));
         }
 
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C
index c4130854..9042689c 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C
@@ -29,11 +29,11 @@
 
 using namespace fapi2;
 
-constexpr auto literal_0b0001 = 0b0001;
-constexpr auto literal_0b0100 = 0b0100;
-constexpr auto literal_0 = 0;
-constexpr auto literal_0x001 = 0x001;
-constexpr auto literal_0b0000 = 0b0000;
+constexpr uint64_t literal_0b0001 = 0b0001;
+constexpr uint64_t literal_0b0100 = 0b0100;
+constexpr uint64_t literal_0 = 0;
+constexpr uint64_t literal_0x001 = 0x001;
+constexpr uint64_t literal_0b0000 = 0b0000;
 
 fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
                              const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1)
@@ -60,24 +60,24 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
             if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_SMALL_SYSTEM))
             {
                 constexpr auto l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_ON, 23, 1, 63 );
+                l_scom_buffer.insert<23, 1, 63, uint64_t>(l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_ON );
             }
             else if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_LARGE_SYSTEM))
             {
                 constexpr auto l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_OFF, 23, 1, 63 );
+                l_scom_buffer.insert<23, 1, 63, uint64_t>(l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_OFF );
             }
 
             if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME))
             {
                 constexpr auto l_EXP_L2_L2MISC_L2CERRS_CFG_HASH_L3_ADDR_EN_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_HASH_L3_ADDR_EN_ON, 21, 1, 63 );
+                l_scom_buffer.insert<21, 1, 63, uint64_t>(l_EXP_L2_L2MISC_L2CERRS_CFG_HASH_L3_ADDR_EN_ON );
             }
 
             if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME))
             {
                 constexpr auto l_EXP_L2_L2MISC_L2CERRS_CFG_CAC_ERR_REPAIR_EN_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_CAC_ERR_REPAIR_EN_ON, 15, 1, 63 );
+                l_scom_buffer.insert<15, 1, 63, uint64_t>(l_EXP_L2_L2MISC_L2CERRS_CFG_CAC_ERR_REPAIR_EN_ON );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x1001080aull, l_scom_buffer));
@@ -85,8 +85,8 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x1001080bull, l_scom_buffer ));
 
-            l_scom_buffer.insert<uint64_t> (literal_0b0001, 4, 4, 60 );
-            l_scom_buffer.insert<uint64_t> (literal_0b0100, 8, 4, 60 );
+            l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0b0001 );
+            l_scom_buffer.insert<8, 4, 60, uint64_t>(literal_0b0100 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x1001080bull, l_scom_buffer));
         }
         {
@@ -94,29 +94,29 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
 
             if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 != literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0, 0, 12, 52 );
+                l_scom_buffer.insert<0, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 );
             }
             else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 == literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x001, 0, 12, 52 );
+                l_scom_buffer.insert<0, 12, 52, uint64_t>(literal_0x001 );
             }
 
             if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 != literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1, 12, 12, 52 );
+                l_scom_buffer.insert<12, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 );
             }
             else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 == literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x001, 12, 12, 52 );
+                l_scom_buffer.insert<12, 12, 52, uint64_t>(literal_0x001 );
             }
 
             if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 != literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2, 24, 12, 52 );
+                l_scom_buffer.insert<24, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 );
             }
             else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 == literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x001, 24, 12, 52 );
+                l_scom_buffer.insert<24, 12, 52, uint64_t>(literal_0x001 );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x10010810ull, l_scom_buffer));
@@ -126,28 +126,28 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
 
             if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 != literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1, 0, 12, 52 );
+                l_scom_buffer.insert<0, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 );
             }
             else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 == literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x001, 0, 12, 52 );
+                l_scom_buffer.insert<0, 12, 52, uint64_t>(literal_0x001 );
             }
 
             if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 != literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2, 12, 12, 52 );
+                l_scom_buffer.insert<12, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 );
             }
             else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 == literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x001, 12, 12, 52 );
+                l_scom_buffer.insert<12, 12, 52, uint64_t>(literal_0x001 );
             }
 
             constexpr auto l_EXP_L2_L2MISC_L2CERRS_EPS_CNT_USE_L2_DIVIDER_EN_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_EPS_CNT_USE_L2_DIVIDER_EN_OFF, 29, 1, 63 );
-            l_scom_buffer.insert<uint64_t> (literal_0b0000, 30, 4, 60 );
-            l_scom_buffer.insert<uint64_t> (literal_0b0001, 24, 4, 60 );
+            l_scom_buffer.insert<29, 1, 63, uint64_t>(l_EXP_L2_L2MISC_L2CERRS_EPS_CNT_USE_L2_DIVIDER_EN_OFF );
+            l_scom_buffer.insert<30, 4, 60, uint64_t>(literal_0b0000 );
+            l_scom_buffer.insert<24, 4, 60, uint64_t>(literal_0b0001 );
             constexpr auto l_EXP_L2_L2MISC_L2CERRS_EPS_MODE_SEL_MODE1 = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_EPS_MODE_SEL_MODE1, 28, 1, 63 );
+            l_scom_buffer.insert<28, 1, 63, uint64_t>(l_EXP_L2_L2MISC_L2CERRS_EPS_MODE_SEL_MODE1 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x10010811ull, l_scom_buffer));
         }
 
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C
index 472925b1..b1c50f02 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C
@@ -29,12 +29,12 @@
 
 using namespace fapi2;
 
-constexpr auto literal_0 = 0;
-constexpr auto literal_0x001 = 0x001;
-constexpr auto literal_0b0 = 0b0;
-constexpr auto literal_0b0000 = 0b0000;
-constexpr auto literal_0b0001 = 0b0001;
-constexpr auto literal_0b0100 = 0b0100;
+constexpr uint64_t literal_0 = 0;
+constexpr uint64_t literal_0x001 = 0x001;
+constexpr uint64_t literal_0b0 = 0b0;
+constexpr uint64_t literal_0b0000 = 0b0000;
+constexpr uint64_t literal_0b0001 = 0b0001;
+constexpr uint64_t literal_0b0100 = 0b0100;
 
 fapi2::ReturnCode p9_l3_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
                              const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1)
@@ -60,29 +60,29 @@ fapi2::ReturnCode p9_l3_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
 
             if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 != literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0, 0, 12, 52 );
+                l_scom_buffer.insert<0, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 );
             }
             else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 == literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x001, 0, 12, 52 );
+                l_scom_buffer.insert<0, 12, 52, uint64_t>(literal_0x001 );
             }
 
             if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 != literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1, 12, 12, 52 );
+                l_scom_buffer.insert<12, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 );
             }
             else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 == literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x001, 12, 12, 52 );
+                l_scom_buffer.insert<12, 12, 52, uint64_t>(literal_0x001 );
             }
 
             if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 != literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2, 24, 12, 52 );
+                l_scom_buffer.insert<24, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 );
             }
             else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 == literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x001, 24, 12, 52 );
+                l_scom_buffer.insert<24, 12, 52, uint64_t>(literal_0x001 );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x10011829ull, l_scom_buffer));
@@ -92,25 +92,25 @@ fapi2::ReturnCode p9_l3_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
 
             if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 != literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1, 0, 12, 52 );
+                l_scom_buffer.insert<0, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 );
             }
             else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 == literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x001, 0, 12, 52 );
+                l_scom_buffer.insert<0, 12, 52, uint64_t>(literal_0x001 );
             }
 
             if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 != literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2, 12, 12, 52 );
+                l_scom_buffer.insert<12, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 );
             }
             else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 == literal_0))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x001, 12, 12, 52 );
+                l_scom_buffer.insert<12, 12, 52, uint64_t>(literal_0x001 );
             }
 
-            l_scom_buffer.insert<uint64_t> (literal_0b0, 34, 1, 63 );
-            l_scom_buffer.insert<uint64_t> (literal_0b0000, 26, 4, 60 );
-            l_scom_buffer.insert<uint64_t> (literal_0b0001, 30, 4, 60 );
+            l_scom_buffer.insert<34, 1, 63, uint64_t>(literal_0b0 );
+            l_scom_buffer.insert<26, 4, 60, uint64_t>(literal_0b0000 );
+            l_scom_buffer.insert<30, 4, 60, uint64_t>(literal_0b0001 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x1001182aull, l_scom_buffer));
         }
         {
@@ -119,34 +119,34 @@ fapi2::ReturnCode p9_l3_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
             if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_SMALL_SYSTEM))
             {
                 constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_ON, 22, 1, 63 );
+                l_scom_buffer.insert<22, 1, 63, uint64_t>(l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_ON );
             }
             else if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_LARGE_SYSTEM))
             {
                 constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_OFF, 22, 1, 63 );
+                l_scom_buffer.insert<22, 1, 63, uint64_t>(l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_OFF );
             }
 
             if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME))
             {
                 constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_ADDR_HASH_EN_CFG_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_ADDR_HASH_EN_CFG_ON, 11, 1, 63 );
+                l_scom_buffer.insert<11, 1, 63, uint64_t>(l_EXP_L3_L3_MISC_L3CERRS_L3_ADDR_HASH_EN_CFG_ON );
             }
 
             if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME))
             {
                 constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_RDSN_LINEDEL_UE_EN_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_RDSN_LINEDEL_UE_EN_ON, 2, 1, 63 );
+                l_scom_buffer.insert<2, 1, 63, uint64_t>(l_EXP_L3_L3_MISC_L3CERRS_L3_RDSN_LINEDEL_UE_EN_ON );
             }
 
             if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME))
             {
                 constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_DMAP_CI_EN_CFG_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_DMAP_CI_EN_CFG_OFF, 1, 1, 63 );
+                l_scom_buffer.insert<1, 1, 63, uint64_t>(l_EXP_L3_L3_MISC_L3CERRS_L3_DMAP_CI_EN_CFG_OFF );
             }
 
-            l_scom_buffer.insert<uint64_t> (literal_0b0001, 14, 4, 60 );
-            l_scom_buffer.insert<uint64_t> (literal_0b0100, 18, 4, 60 );
+            l_scom_buffer.insert<14, 4, 60, uint64_t>(literal_0b0001 );
+            l_scom_buffer.insert<18, 4, 60, uint64_t>(literal_0b0100 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x1001182bull, l_scom_buffer));
         }
 
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mmu_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_mmu_scom.C
index 03a5f822..396fdd0e 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mmu_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_mmu_scom.C
@@ -29,15 +29,15 @@
 
 using namespace fapi2;
 
-constexpr auto literal_0x04047C0000000000 = 0x04047C0000000000;
-constexpr auto literal_0x0000000000000000 = 0x0000000000000000;
-constexpr auto literal_0x409B000000000000 = 0x409B000000000000;
-constexpr auto literal_0x0000FAF800FF = 0x0000FAF800FF;
-constexpr auto literal_0x000000000000 = 0x000000000000;
-constexpr auto literal_0x910000040B00 = 0x910000040B00;
-constexpr auto literal_0b11111 = 0b11111;
-constexpr auto literal_0x00E = 0x00E;
-constexpr auto literal_0x0258 = 0x0258;
+constexpr uint64_t literal_0x04047C0000000000 = 0x04047C0000000000;
+constexpr uint64_t literal_0x0000000000000000 = 0x0000000000000000;
+constexpr uint64_t literal_0x409B000000000000 = 0x409B000000000000;
+constexpr uint64_t literal_0x0000FAF800FF = 0x0000FAF800FF;
+constexpr uint64_t literal_0x000000000000 = 0x000000000000;
+constexpr uint64_t literal_0x910000040B00 = 0x910000040B00;
+constexpr uint64_t literal_0b11111 = 0b11111;
+constexpr uint64_t literal_0x00E = 0x00E;
+constexpr uint64_t literal_0x0258 = 0x0258;
 
 fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0,
                               const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1)
@@ -55,19 +55,19 @@ fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5012c03ull, l_scom_buffer ));
 
-            l_scom_buffer.insert<uint64_t> (literal_0x04047C0000000000, 0, 22, 0 );
+            l_scom_buffer.insert<0, 22, 0, uint64_t>(literal_0x04047C0000000000 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x5012c03ull, l_scom_buffer));
         }
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5012c06ull, l_scom_buffer ));
 
-            l_scom_buffer.insert<uint64_t> (literal_0x0000000000000000, 0, 22, 0 );
+            l_scom_buffer.insert<0, 22, 0, uint64_t>(literal_0x0000000000000000 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x5012c06ull, l_scom_buffer));
         }
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5012c07ull, l_scom_buffer ));
 
-            l_scom_buffer.insert<uint64_t> (literal_0x409B000000000000, 0, 22, 0 );
+            l_scom_buffer.insert<0, 22, 0, uint64_t>(literal_0x409B000000000000 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x5012c07ull, l_scom_buffer));
         }
         {
@@ -76,23 +76,23 @@ fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_SMALL_SYSTEM))
             {
                 constexpr auto l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_ON, 33, 1, 63 );
+                l_scom_buffer.insert<33, 1, 63, uint64_t>(l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_ON );
             }
             else if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_LARGE_SYSTEM))
             {
                 constexpr auto l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_OFF, 33, 1, 63 );
+                l_scom_buffer.insert<33, 1, 63, uint64_t>(l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_OFF );
             }
 
             if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_NODE))
             {
                 constexpr auto l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_CFG_PUMP_MODE_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_CFG_PUMP_MODE_ON, 39, 1, 63 );
+                l_scom_buffer.insert<39, 1, 63, uint64_t>(l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_CFG_PUMP_MODE_ON );
             }
             else if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
             {
                 constexpr auto l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_CFG_PUMP_MODE_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_CFG_PUMP_MODE_OFF, 39, 1, 63 );
+                l_scom_buffer.insert<39, 1, 63, uint64_t>(l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_CFG_PUMP_MODE_OFF );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x5012c15ull, l_scom_buffer));
@@ -100,57 +100,57 @@ fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5012c43ull, l_scom_buffer ));
 
-            l_scom_buffer.insert<uint64_t> (literal_0x0000FAF800FF, 0, 48, 16 );
+            l_scom_buffer.insert<0, 48, 16, uint64_t>(literal_0x0000FAF800FF );
             FAPI_TRY(fapi2::putScom(TGT0, 0x5012c43ull, l_scom_buffer));
         }
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5012c46ull, l_scom_buffer ));
 
-            l_scom_buffer.insert<uint64_t> (literal_0x000000000000, 0, 48, 16 );
+            l_scom_buffer.insert<0, 48, 16, uint64_t>(literal_0x000000000000 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x5012c46ull, l_scom_buffer));
         }
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5012c47ull, l_scom_buffer ));
 
-            l_scom_buffer.insert<uint64_t> (literal_0x910000040B00, 0, 48, 16 );
+            l_scom_buffer.insert<0, 48, 16, uint64_t>(literal_0x910000040B00 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x5012c47ull, l_scom_buffer));
         }
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5012c52ull, l_scom_buffer ));
 
             constexpr auto l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV = 0x70;
-            l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 20, 1, 57 );
-            l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 24, 1, 62 );
-            l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 26, 1, 63 );
-            l_scom_buffer.insert<uint64_t> (literal_0b11111, 30, 1, 59 );
-            l_scom_buffer.insert<uint64_t> (literal_0b11111, 60, 4, 60 );
-            l_scom_buffer.insert<uint64_t> (literal_0x00E, 0, 12, 52 );
+            l_scom_buffer.insert<20, 1, 57, uint64_t>(l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV );
+            l_scom_buffer.insert<24, 1, 62, uint64_t>(l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV );
+            l_scom_buffer.insert<26, 1, 63, uint64_t>(l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV );
+            l_scom_buffer.insert<30, 1, 59, uint64_t>(literal_0b11111 );
+            l_scom_buffer.insert<60, 4, 60, uint64_t>(literal_0b11111 );
+            l_scom_buffer.insert<0, 12, 52, uint64_t>(literal_0x00E );
             FAPI_TRY(fapi2::putScom(TGT0, 0x5012c52ull, l_scom_buffer));
         }
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5012c53ull, l_scom_buffer ));
 
             constexpr auto l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV = 0x70;
-            l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 2, 2, 60 );
-            l_scom_buffer.insert<uint64_t> (literal_0x0258, 32, 16, 48 );
+            l_scom_buffer.insert<2, 2, 60, uint64_t>(l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV );
+            l_scom_buffer.insert<32, 16, 48, uint64_t>(literal_0x0258 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x5012c53ull, l_scom_buffer));
         }
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5012c54ull, l_scom_buffer ));
 
             constexpr auto l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV = 0x70;
-            l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 16, 1, 58 );
+            l_scom_buffer.insert<16, 1, 58, uint64_t>(l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV );
             FAPI_TRY(fapi2::putScom(TGT0, 0x5012c54ull, l_scom_buffer));
         }
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5012c55ull, l_scom_buffer ));
 
             constexpr auto l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV = 0x70;
-            l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 16, 1, 59 );
+            l_scom_buffer.insert<16, 1, 59, uint64_t>(l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV );
             constexpr auto l_NMMU_MM_CFG_NMMU_CTL_TLB_HASH_PID_DIS_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_NMMU_MM_CFG_NMMU_CTL_TLB_HASH_PID_DIS_ON, 21, 1, 63 );
+            l_scom_buffer.insert<21, 1, 63, uint64_t>(l_NMMU_MM_CFG_NMMU_CTL_TLB_HASH_PID_DIS_ON );
             constexpr auto l_NMMU_MM_CFG_NMMU_CTL_TLB_ISS543B_FIX_EN_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_NMMU_MM_CFG_NMMU_CTL_TLB_ISS543B_FIX_EN_ON, 53, 1, 63 );
+            l_scom_buffer.insert<53, 1, 63, uint64_t>(l_NMMU_MM_CFG_NMMU_CTL_TLB_ISS543B_FIX_EN_ON );
             FAPI_TRY(fapi2::putScom(TGT0, 0x5012c55ull, l_scom_buffer));
         }
 
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C
index 46cb0a54..efe64c7d 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C
@@ -29,10 +29,10 @@
 
 using namespace fapi2;
 
-constexpr auto literal_0b0001 = 0b0001;
-constexpr auto literal_0b0100 = 0b0100;
-constexpr auto literal_0x8 = 0x8;
-constexpr auto literal_0x10 = 0x10;
+constexpr uint64_t literal_0b0001 = 0b0001;
+constexpr uint64_t literal_0b0100 = 0b0100;
+constexpr uint64_t literal_0x8 = 0x8;
+constexpr uint64_t literal_0x10 = 0x10;
 
 fapi2::ReturnCode p9_ncu_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
                               const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1)
@@ -47,12 +47,12 @@ fapi2::ReturnCode p9_ncu_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
             if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_SMALL_SYSTEM))
             {
                 constexpr auto l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_ON, 9, 1, 63 );
+                l_scom_buffer.insert<9, 1, 63, uint64_t>(l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_ON );
             }
             else if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_LARGE_SYSTEM))
             {
                 constexpr auto l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_OFF, 9, 1, 63 );
+                l_scom_buffer.insert<9, 1, 63, uint64_t>(l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_OFF );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x1001100aull, l_scom_buffer));
@@ -60,12 +60,12 @@ fapi2::ReturnCode p9_ncu_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x1001100bull, l_scom_buffer ));
 
-            l_scom_buffer.insert<uint64_t> (literal_0b0001, 0, 4, 60 );
-            l_scom_buffer.insert<uint64_t> (literal_0b0100, 4, 4, 60 );
-            l_scom_buffer.insert<uint64_t> (literal_0x8, 8, 10, 54 );
-            l_scom_buffer.insert<uint64_t> (literal_0x10, 26, 10, 54 );
-            l_scom_buffer.insert<uint64_t> (literal_0x8, 18, 4, 60 );
-            l_scom_buffer.insert<uint64_t> (literal_0x8, 22, 4, 60 );
+            l_scom_buffer.insert<0, 4, 60, uint64_t>(literal_0b0001 );
+            l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0b0100 );
+            l_scom_buffer.insert<8, 10, 54, uint64_t>(literal_0x8 );
+            l_scom_buffer.insert<26, 10, 54, uint64_t>(literal_0x10 );
+            l_scom_buffer.insert<18, 4, 60, uint64_t>(literal_0x8 );
+            l_scom_buffer.insert<22, 4, 60, uint64_t>(literal_0x8 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x1001100bull, l_scom_buffer));
         }