diff options
| author | Robert Norton | 2016-05-12 12:02:01 +0100 |
|---|---|---|
| committer | Robert Norton | 2016-05-12 12:02:06 +0100 |
| commit | 19a026fb51378c727d6f2da70bc828b796ab514d (patch) | |
| tree | 3991a7264069bec1b1bc9d58b135a635d2d44c74 /cheri | |
| parent | 123c93b1afc3997d8d2a58c75c05184f4fe8ef73 (diff) | |
remove redundant wrapper function 'TranslateOrExit' and rename uses.
Diffstat (limited to 'cheri')
| -rw-r--r-- | cheri/cheri_insts.sail | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cheri/cheri_insts.sail b/cheri/cheri_insts.sail index cccb361a..a54b8526 100644 --- a/cheri/cheri_insts.sail +++ b/cheri/cheri_insts.sail @@ -554,7 +554,7 @@ function clause execute (CLoad(rd, cb, rt, offset, signext, width, linked)) = exit (SignalExceptionBadAddr(AdEL, vAddr64)) else { - pAddr := (TranslateOrExit(vAddr64, LoadData)); + pAddr := (TLBTranslate(vAddr64, LoadData)); widthBytes := wordWidthBytes(width); memResult := if (linked) then { @@ -609,7 +609,7 @@ function clause execute (CStore(rs, cb, rt, rd, offset, width, conditional)) = exit (SignalExceptionBadAddr(AdES, vAddr64)) else { - pAddr := (TranslateOrExit(vAddr64, StoreData)); + pAddr := (TLBTranslate(vAddr64, StoreData)); rs_val := rGPR(rs); if (conditional) then { @@ -670,7 +670,7 @@ function clause execute (CSC(cs, cb, rt, rd, offset, conditional)) = exit (SignalExceptionBadAddr(AdES, vAddr64)) else { - pAddr := (TranslateOrExit(vAddr64, if cs_val.tag then StoreData else StoreData)); (* XXX use StoreCap here. *) + pAddr := (TLBTranslate(vAddr64, if cs_val.tag then StoreData else StoreData)); (* XXX use StoreCap here. *) if (conditional) then { success := if (CP0LLBit[0]) then @@ -715,7 +715,7 @@ function clause execute (CLC(cd, cb, rt, offset, linked)) = exit (SignalExceptionBadAddr(AdEL, vAddr64)) else { - pAddr := (TranslateOrExit(vAddr64, LoadData)); (* XXX use LoadCap here. *) + pAddr := (TLBTranslate(vAddr64, LoadData)); (* XXX use LoadCap here. *) let (tag, mem) = (if (linked) then { |