commit 9309d9b6dc6a4ef748f41930bd682b32fc1cf5c7
author Mike Leach <mike.leach@linaro.org> Tue Feb 18 10:21:43 2020 +0000
committer Mike Leach <mike.leach@linaro.org> Thu Mar 26 21:51:59 2020 +0000
tree 0f0c5f67d16ba665855679fc51a3748c36daac44
parent e5eb0414ec86fe32e73f413bca29b7f650ac44c3

opencsd: etmv4: Update memory space requests on mem access.

Adds common memory space access function to use EL + S/NS when
making memory access requests.

Signed-off-by: Mike Leach <mike.leach@linaro.org>

decoder/include/opencsd/etmv4/trc_pkt_decode_etmv4i.h

diff --git a/decoder/include/opencsd/etmv4/trc_pkt_decode_etmv4i.h b/decoder/include/opencsd/etmv4/trc_pkt_decode_etmv4i.h
index e02f88b..c85bf48 100644
--- a/decoder/include/opencsd/etmv4/trc_pkt_decode_etmv4i.h
+++ b/decoder/include/opencsd/etmv4/trc_pkt_decode_etmv4i.h
@@ -125,6 +125,8 @@
 
     void setElemTraceRange(OcsdTraceElement &elemIn, const instr_range_t &addr_range, const bool executed, ocsd_trc_index_t index);
 
+    ocsd_mem_space_acc_t getCurrMemSpace();
+
 //** intra packet state (see ETMv4 spec 6.2.1);
 
     // timestamping

decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp

diff --git a/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp b/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp
index 4207ea4..d429f21 100644
--- a/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp
+++ b/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp
@@ -1313,9 +1313,6 @@
     uint32_t bytesReq;
     ocsd_err_t err = OCSD_OK;
 
-    // TBD?: update mem space to allow for EL as well.
-    ocsd_mem_space_acc_t mem_space = m_is_secure ? OCSD_MEM_SPACE_S : OCSD_MEM_SPACE_N;
-
     range.st_addr = range.en_addr = m_instr_info.instr_addr;
     range.num_instr = 0;
 
@@ -1325,7 +1322,7 @@
     {
         // start off by reading next opcode;
         bytesReq = 4;
-        err = accessMemory(m_instr_info.instr_addr,mem_space,&bytesReq,(uint8_t *)&opcode);
+        err = accessMemory(m_instr_info.instr_addr, getCurrMemSpace(),&bytesReq,(uint8_t *)&opcode);
         if(err != OCSD_OK) break;
 
         if(bytesReq == 4) // got data back
@@ -1407,4 +1404,29 @@
     }
     return err;
 }
+
+inline ocsd_mem_space_acc_t TrcPktDecodeEtmV4I::getCurrMemSpace()
+{
+    static ocsd_mem_space_acc_t SMemSpace[] = {
+        OCSD_MEM_SPACE_EL1S,
+        OCSD_MEM_SPACE_EL1S,
+        OCSD_MEM_SPACE_EL2S,
+        OCSD_MEM_SPACE_EL3
+    };
+
+    static ocsd_mem_space_acc_t NSMemSpace[] = {
+        OCSD_MEM_SPACE_EL1N,
+        OCSD_MEM_SPACE_EL1N,
+        OCSD_MEM_SPACE_EL2,
+        OCSD_MEM_SPACE_EL3
+    };
+
+    /* if no valid EL value - just use S/NS */
+    if (!outElem().context.el_valid)
+        return  m_is_secure ? OCSD_MEM_SPACE_S : OCSD_MEM_SPACE_N;
+    
+    /* mem space according to EL + S/NS */
+    int el = (int)(outElem().context.exception_level) & 0x3;
+    return m_is_secure ? SMemSpace[el] : NSMemSpace[el];
+}
 /* End of File trc_pkt_decode_etmv4i.cpp */