Merge pull request #2497 from dhong44/fixRIMapping

Fix Runtime Instrumentation Control Block Mapping

runtime/port/common/j9ri.h

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2014 IBM Corp. and others
+ * Copyright (c) 2001, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -36,8 +36,7 @@ typedef struct riControlBlock {
    uint64_t limitAddr;
 
    /* Word 6 - Flags */
-   uint32_t pad28:28;
-   uint32_t suspensionControl:1;
+   uint32_t padAtWord6Bit0:29;
    uint32_t reportingGroupSize:3;
 
    /* Word 7 */
@@ -52,22 +51,26 @@ typedef struct riControlBlock {
    uint32_t RInext:1;
    /* MAE - Max Address exceeded bit */
    uint32_t MAE:1;
-   uint32_t pad2:2;
+   uint32_t padAtWord7Bit6:2;
    /* Branch Controls */
    uint32_t callTypeBranches:1;
    uint32_t returnTypeBranches:1;
    uint32_t otherTypeBranches:1;
    uint32_t branchOnCondAsOtherTypeBrranches:1;
    uint32_t RIEmit:1;
    uint32_t TXAbort:1;
-   uint32_t pad3:2;
+
+   uint32_t guardedStorage:1;
+   uint32_t padAtWord7Bit15:1;
    /* Branch Prediction Controls */
    uint32_t bp_notTakenButPredictedTaken:1;
    uint32_t bp_takenButPredictedNotTaken:1;
    uint32_t bp_takenButWrongTarget:1;
    uint32_t bp_notTAkenButWrongTarget:1;
 
-   uint32_t pad4:2;
+   /* Suppression Controls */
+   uint32_t suppressPrimaryCPU:1;
+   uint32_t suppressSecondaryCPU:1;
 
    uint32_t DCacheMissExtra:1;
    uint32_t cacheLatencyLevelOverride:1;