forked from Github_Repos/cvw
		
	attempt no 1: just change out x28s for x31s
This commit is contained in:
		
							parent
							
								
									49b5fa3994
								
							
						
					
					
						commit
						8794bf1afa
					
				@ -503,9 +503,9 @@ for xlen in xlens:
 | 
			
		||||
        if fromMode == "s" or fromMode == "u":
 | 
			
		||||
          lines += f"""
 | 
			
		||||
            li x1, 0b110000000000
 | 
			
		||||
            csrrc x28, mstatus, x1
 | 
			
		||||
            csrrc x31, mstatus, x1
 | 
			
		||||
            li x1, 0b0100000000000
 | 
			
		||||
            csrrs x28, mstatus, x1
 | 
			
		||||
            csrrs x31, mstatus, x1
 | 
			
		||||
 | 
			
		||||
            auipc x1, 0
 | 
			
		||||
            addi x1, x1, 16 # x1 is now right after the mret instruction
 | 
			
		||||
@ -520,7 +520,7 @@ for xlen in xlens:
 | 
			
		||||
          lines += f"""
 | 
			
		||||
 | 
			
		||||
          li x1, 0b110000000000
 | 
			
		||||
          csrrc x28, sstatus, x1
 | 
			
		||||
          csrrc x31, sstatus, x1
 | 
			
		||||
 | 
			
		||||
          auipc x1, 0
 | 
			
		||||
          addi x1, x1, 16 # x1 is now right after the sret instruction
 | 
			
		||||
@ -567,4 +567,4 @@ for xlen in xlens:
 | 
			
		||||
    lines = lines + "\nRV_COMPLIANCE_DATA_END\n" 
 | 
			
		||||
    f.write(lines)
 | 
			
		||||
    f.close()
 | 
			
		||||
    r.close()
 | 
			
		||||
    r.close()
 | 
			
		||||
 | 
			
		||||
@ -233,9 +233,9 @@ def writeTest(storecmd, f, r, test, interrupt, code, resetHander = ""):
 | 
			
		||||
          {beforeTest}
 | 
			
		||||
 | 
			
		||||
          li x1, 0b110000000000
 | 
			
		||||
          csrrc x28, {testMode}status, x1
 | 
			
		||||
          csrrc x31, {testMode}status, x1
 | 
			
		||||
          li x1, 0b{"01" if mode == "s" else "00"}00000000000
 | 
			
		||||
          csrrs x28, {testMode}status, x1
 | 
			
		||||
          csrrs x31, {testMode}status, x1
 | 
			
		||||
 | 
			
		||||
          auipc x1, 0
 | 
			
		||||
          addi x1, x1, 16 # x1 is now right after the ret instruction
 | 
			
		||||
 | 
			
		||||
@ -210,9 +210,9 @@ for xlen in xlens:
 | 
			
		||||
      if fromMode == "s" or fromMode == "u":
 | 
			
		||||
        lines += f"""
 | 
			
		||||
          li x1, 0b110000000000
 | 
			
		||||
          csrrc x28, mstatus, x1
 | 
			
		||||
          csrrc x31, mstatus, x1
 | 
			
		||||
          li x1, 0b0100000000000
 | 
			
		||||
          csrrs x28, mstatus, x1
 | 
			
		||||
          csrrs x31, mstatus, x1
 | 
			
		||||
 | 
			
		||||
          auipc x1, 0
 | 
			
		||||
          addi x1, x1, 16 # x1 is now right after the mret instruction
 | 
			
		||||
@ -226,7 +226,7 @@ for xlen in xlens:
 | 
			
		||||
        lines += f"""
 | 
			
		||||
 | 
			
		||||
        li x1, 0b110000000000
 | 
			
		||||
        csrrc x28, sstatus, x1
 | 
			
		||||
        csrrc x31, sstatus, x1
 | 
			
		||||
 | 
			
		||||
        auipc x1, 0
 | 
			
		||||
        addi x1, x1, 16 # x1 is now right after the sret instruction
 | 
			
		||||
@ -260,4 +260,4 @@ for xlen in xlens:
 | 
			
		||||
    lines = lines + "\nRV_COMPLIANCE_DATA_END\n" 
 | 
			
		||||
    f.write(lines)
 | 
			
		||||
    f.close()
 | 
			
		||||
    r.close()
 | 
			
		||||
    r.close()
 | 
			
		||||
 | 
			
		||||
@ -346,9 +346,9 @@ for xlen in xlens:
 | 
			
		||||
      # bring down to supervisor mode
 | 
			
		||||
      lines += f"""
 | 
			
		||||
            li x1, 0b110000000000
 | 
			
		||||
            csrrc x28, mstatus, x1
 | 
			
		||||
            csrrc x31, mstatus, x1
 | 
			
		||||
            li x1, 0b0100000000000
 | 
			
		||||
            csrrs x28, mstatus, x1
 | 
			
		||||
            csrrs x31, mstatus, x1
 | 
			
		||||
 | 
			
		||||
            auipc x1, 0
 | 
			
		||||
            addi x1, x1, 16 # x1 is now right after the mret instruction
 | 
			
		||||
 | 
			
		||||
@ -304,9 +304,9 @@ for xlen in xlens:
 | 
			
		||||
        if fromMode == "s" or fromMode == "u":
 | 
			
		||||
          lines += f"""
 | 
			
		||||
            li x1, 0b110000000000
 | 
			
		||||
            csrrc x28, mstatus, x1
 | 
			
		||||
            csrrc x31, mstatus, x1
 | 
			
		||||
            li x1, 0b0100000000000
 | 
			
		||||
            csrrs x28, mstatus, x1
 | 
			
		||||
            csrrs x31, mstatus, x1
 | 
			
		||||
 | 
			
		||||
            auipc x1, 0
 | 
			
		||||
            addi x1, x1, 16 # x1 is now right after the mret instruction
 | 
			
		||||
@ -321,7 +321,7 @@ for xlen in xlens:
 | 
			
		||||
          lines += f"""
 | 
			
		||||
 | 
			
		||||
          li x1, 0b110000000000
 | 
			
		||||
          csrrc x28, sstatus, x1
 | 
			
		||||
          csrrc x31, sstatus, x1
 | 
			
		||||
 | 
			
		||||
          auipc x1, 0
 | 
			
		||||
          addi x1, x1, 16 # x1 is now right after the sret instruction
 | 
			
		||||
 | 
			
		||||
@ -406,9 +406,9 @@ for xlen in xlens:
 | 
			
		||||
          if fromMode == "s" or fromMode == "u":
 | 
			
		||||
            lines += f"""
 | 
			
		||||
              li x1, 0b110000000000
 | 
			
		||||
              csrrc x28, mstatus, x1
 | 
			
		||||
              csrrc x31, mstatus, x1
 | 
			
		||||
              li x1, 0b0100000000000
 | 
			
		||||
              csrrs x28, mstatus, x1
 | 
			
		||||
              csrrs x31, mstatus, x1
 | 
			
		||||
 | 
			
		||||
              auipc x1, 0
 | 
			
		||||
              addi x1, x1, 16 # x1 is now right after the mret instruction
 | 
			
		||||
@ -423,7 +423,7 @@ for xlen in xlens:
 | 
			
		||||
            lines += f"""
 | 
			
		||||
 | 
			
		||||
            li x1, 0b110000000000
 | 
			
		||||
            csrrc x28, sstatus, x1
 | 
			
		||||
            csrrc x31, sstatus, x1
 | 
			
		||||
 | 
			
		||||
            auipc x1, 0
 | 
			
		||||
            addi x1, x1, 16 # x1 is now right after the sret instruction
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user