From dce5e79f65374866d4f08572ea44bae18bd085d7 Mon Sep 17 00:00:00 2001
From: Blaise Tine <tinebp@yahoo.com>
Date: Mon, 15 May 2023 18:53:24 -0400
Subject: [PATCH] toolchain update

---
 ci/prebuilt.sh           | 12 ++++++------
 ci/toolchain_install.sh  | 14 +++++++-------
 sim/rtlsim/Makefile      |  2 +-
 sim/rtlsim/processor.cpp |  4 ++--
 sim/vlsim/Makefile       |  2 +-
 sim/vlsim/opae_sim.cpp   |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ci/prebuilt.sh b/ci/prebuilt.sh
index cc9ff3dd..6b0f81e7 100755
--- a/ci/prebuilt.sh
+++ b/ci/prebuilt.sh
@@ -23,17 +23,17 @@ riscv()
 llvm() 
 {
     echo "prebuilt llvm-riscv..."
-    tar -C $SRCDIR -cvjf llvm-riscv.tar.bz2 llvm-riscv
-    split -b 50M llvm-riscv.tar.bz2 "llvm-riscv.tar.bz2.part"    
-    mv llvm-riscv.tar.bz2.part* $DESTDIR/llvm-riscv/$OS_DIR
-    rm llvm-riscv.tar.bz2
+    tar -C $SRCDIR -cvjf llvm-vortex1.tar.bz2 llvm-riscv
+    split -b 50M llvm-vortex1.tar.bz2 "llvm-vortex1.tar.bz2.part"    
+    mv llvm-vortex1.tar.bz2.part* $DESTDIR/llvm-vortex/$OS_DIR
+    rm llvm-vortex1.tar.bz2
 }
 
 pocl() 
 {
     echo "prebuilt pocl..."
-    tar -C $SRCDIR -cvjf pocl.tar.bz2 pocl
-    mv pocl.tar.bz2 $DESTDIR/pocl/$OS_DIR
+    tar -C $SRCDIR -cvjf pocl1.tar.bz2 pocl
+    mv pocl1.tar.bz2 $DESTDIR/pocl/$OS_DIR
 }
 
 verilator() 
diff --git a/ci/toolchain_install.sh b/ci/toolchain_install.sh
index 5194974b..6422300d 100755
--- a/ci/toolchain_install.sh
+++ b/ci/toolchain_install.sh
@@ -37,20 +37,20 @@ llvm()
 {
     for x in {a..b} 
     do
-        wget $REPOSITORY/llvm-riscv/ubuntu/bionic/llvm-riscv.tar.bz2.parta$x
+        wget $REPOSITORY/llvm-vortex/ubuntu/bionic/llvm-vortex1.tar.bz2.parta$x
     done
-    cat llvm-riscv.tar.bz2.parta* > llvm-riscv.tar.bz2
-    tar -xvf llvm-riscv.tar.bz2
-    rm -f llvm-riscv.tar.bz2*
+    cat llvm-vortex1.tar.bz2.parta* > llvm-vortex1.tar.bz2
+    tar -xvf llvm-vortex1.tar.bz2
+    rm -f llvm-vortex1.tar.bz2*
     cp -r llvm-riscv $DESTDIR
     rm -rf llvm-riscv
 }
 
 pocl()
 {
-    wget $REPOSITORY/pocl/ubuntu/bionic/pocl.tar.bz2
-    tar -xvf pocl.tar.bz2
-    rm -f pocl.tar.bz2
+    wget $REPOSITORY/pocl/ubuntu/bionic/pocl1.tar.bz2
+    tar -xvf pocl1.tar.bz2
+    rm -f pocl1.tar.bz2
     cp -r pocl $DESTDIR
     rm -rf pocl
 }
diff --git a/sim/rtlsim/Makefile b/sim/rtlsim/Makefile
index 3a48625b..2f7bb8f7 100644
--- a/sim/rtlsim/Makefile
+++ b/sim/rtlsim/Makefile
@@ -44,7 +44,7 @@ endif
 
 VL_FLAGS = --exe --cc $(TOP) --top-module $(TOP)
 VL_FLAGS += -O2 --language 1800-2009 --assert -Wall -Wpedantic
-VL_FLAGS += -Wno-DECLFILENAME -Wno-REDEFMACRO
+VL_FLAGS += -Wno-DECLFILENAME -Wno-REDEFMACRO -Wno-EOFNEWLINE
 VL_FLAGS += --x-initial unique --x-assign unique
 VL_FLAGS += verilator.vlt
 VL_FLAGS += $(RTL_INCLUDE)
diff --git a/sim/rtlsim/processor.cpp b/sim/rtlsim/processor.cpp
index 0838c0ad..60e68eff 100644
--- a/sim/rtlsim/processor.cpp
+++ b/sim/rtlsim/processor.cpp
@@ -462,7 +462,7 @@ private:
           }
           printf("\n");
         */
-        memcpy((uint8_t*)device_->mem_rsp_data, mem_req->block.data(), MEM_BLOCK_SIZE);
+        memcpy(device_->mem_rsp_data.data(), mem_req->block.data(), MEM_BLOCK_SIZE);
         device_->mem_rsp_tag = mem_req->tag;   
         pending_mem_reqs_.erase(mem_rsp_it);
         mem_rd_rsp_active_ = true;
@@ -478,7 +478,7 @@ private:
       if (device_->mem_req_rw) {        
         // process writes
         uint64_t byteen = device_->mem_req_byteen;        
-        uint8_t* data = (uint8_t*)(device_->mem_req_data);
+        uint8_t* data = (uint8_t*)device_->mem_req_data.data();
 
         // check console output
         if (byte_addr >= IO_COUT_ADDR 
diff --git a/sim/vlsim/Makefile b/sim/vlsim/Makefile
index 3358c664..7565aaab 100644
--- a/sim/vlsim/Makefile
+++ b/sim/vlsim/Makefile
@@ -41,7 +41,7 @@ TOP = vortex_afu_shim
 
 VL_FLAGS = --exe --cc $(TOP) --top-module $(TOP)
 VL_FLAGS += -O2 --language 1800-2009 --assert -Wall -Wpedantic
-VL_FLAGS += -Wno-DECLFILENAME -Wno-REDEFMACRO
+VL_FLAGS += -Wno-DECLFILENAME -Wno-REDEFMACRO -Wno-EOFNEWLINE
 VL_FLAGS += --x-initial unique --x-assign unique
 VL_FLAGS += verilator.vlt
 VL_FLAGS += $(RTL_INCLUDE)
diff --git a/sim/vlsim/opae_sim.cpp b/sim/vlsim/opae_sim.cpp
index 17bcbb2e..de4bf191 100644
--- a/sim/vlsim/opae_sim.cpp
+++ b/sim/vlsim/opae_sim.cpp
@@ -399,7 +399,7 @@ private:
       unsigned byte_addr = device_->avs_address[b] * MEM_BLOCK_SIZE;
       if (device_->avs_write[b]) {           
         uint64_t byteen = device_->avs_byteenable[b];        
-        uint8_t* data = (uint8_t*)(device_->avs_writedata[b]);
+        uint8_t* data = (uint8_t*)device_->avs_writedata[b].data();
         for (int i = 0; i < MEM_BLOCK_SIZE; i++) {
           if ((byteen >> i) & 0x1) {            
             (*ram_)[byte_addr + i] = data[i];