[sim] vlen calc reflects the hardware

diff --git a/riscv/processor.cc b/riscv/processor.cc
index bb1a9822012c35249687869328baa172705ed176..35488104783be5d664c1361b6c327f1359cb05b5 100644 (file)
--- a/riscv/processor.cc
+++ b/riscv/processor.cc
@@ -34,11 +34,12 @@ processor_t::processor_t(sim_t* _sim, char* _mem, size_t _memsz)
   memset(counters,0,sizeof(counters));
 
   // vector stuff
+  vecbanks = 0xff;
+  vecbanks_count = 8;
   utidx = -1;
   vlmax = 8;
   vl = 0;
-  nxpr_all = 256;
-  nfpr_all = 256;
+  nxfpr_bank = 256;
   nxpr_use = 0;
   nfpr_use = 0;
   for (int i=0; i<MAX_UTS; i++)
@@ -135,14 +136,10 @@ void processor_t::set_fsr(uint32_t val)
 
 void processor_t::vcfg()
 {
-  if (nxpr_use == 0 && nfpr_use == 0)
-    vlmax = 8;
-  else if (nfpr_use == 0)
-    vlmax = (nxpr_all-1) / (nxpr_use-1);
-  else if (nxpr_use == 0)
-    vlmax = (nfpr_all-1) / (nfpr_use-1);
+  if (nxpr_use + nfpr_use < 2)
+    vlmax = nxfpr_bank * vecbanks_count;
   else
-    vlmax = std::min((nxpr_all-1) / (nxpr_use-1), (nfpr_all-1) / (nfpr_use-1));
+    vlmax = (nxfpr_bank / (nxpr_use + nfpr_use - 1)) * vecbanks_count;
 
   vlmax = std::min(vlmax, MAX_UTS);
 }

diff --git a/riscv/processor.h b/riscv/processor.h
index f269fa04ce96847bdb8e08c50b179258e1de18d8..7a09edf72db1fbfb536eae3a6155acb8c30ea6f7 100644 (file)
--- a/riscv/processor.h
+++ b/riscv/processor.h
@@ -7,7 +7,7 @@
 #include "mmu.h"
 #include "icsim.h"
 
-#define MAX_UTS 32
+#define MAX_UTS 2048
 
 class sim_t;
 
@@ -34,14 +34,12 @@ private:
   reg_t evec;
   reg_t tohost;
   reg_t fromhost;
-  reg_t vecbanks;
   reg_t pcr_k0;
   reg_t pcr_k1;
   uint32_t id;
   uint32_t sr;
   uint32_t count;
   uint32_t compare;
-  uint32_t vecbanks_count;
 
   // unprivileged control registers
   uint32_t fsr;
@@ -65,12 +63,14 @@ private:
   void vcfg();
   void setvl(int vlapp);
 
+  reg_t vecbanks;
+  uint32_t vecbanks_count;
+
   bool utmode;
   int utidx;
   int vlmax;
   int vl;
-  int nxpr_all;
-  int nfpr_all;
+  int nxfpr_bank;
   int nxpr_use;
   int nfpr_use;
   processor_t* uts[MAX_UTS];