19e06acc65
I made a few choices so far that can probably be discussed: - got rid of `modn` on `UInt`, nobody seems to use it apart from the definition of `shift` which can use normal `mod` - removed the previous defeq optimized definition of `USize.size` in favor for a normal one. The motivation was to allow `OfNat` to work which doesn't seem to be necessary anymore afaict. - Minimized uses of `.val`, should we maybe mark it deprecated? - Mostly got rid of `.val` in basically all theorems as the proper next level of API would now be `.toBitVec`. We could probably re-prove them but it would be more annoying given the change of definition. - Did not yet redefine `log2` in terms of `BitVec` as this would require a `log2` in `BitVec` as well, do we want this? - I added a couple of theorems around the relation of `<` on `UInt` and `Nat`. These were previously not needed because defeq was used all over the place to save us. I did not yet generalize these to all types as I wasn't sure if they are the appropriate lemma that we want to have.
34 lines
1.5 KiB
Text
34 lines
1.5 KiB
Text
def UInt32.ofNatCore' (n : Nat) (h : n < UInt32.size) : UInt32 := {
|
|
toBitVec := ⟨{ val := n, isLt := h }⟩
|
|
}
|
|
|
|
#eval UInt32.ofNatCore' 10 (by decide)
|
|
|
|
def UInt64.ofNatCore' (n : Nat) (h : n < UInt64.size) : UInt64 := {
|
|
toBitVec := ⟨{ val := n, isLt := h }⟩
|
|
}
|
|
|
|
#eval UInt64.ofNatCore' 3 (by decide)
|
|
|
|
#eval toString $ { toBitVec := ⟨{ val := 3, isLt := (by decide) }⟩ : UInt8 }
|
|
#eval (3 : UInt8).val
|
|
#eval toString $ { toBitVec := ⟨{ val := 3, isLt := (by decide) }⟩ : UInt16 }
|
|
#eval (3 : UInt16).val
|
|
#eval toString $ { toBitVec := ⟨{ val := 3, isLt := (by decide) }⟩ : UInt32 }
|
|
#eval (3 : UInt32).val
|
|
#eval toString $ { toBitVec := ⟨{ val := 3, isLt := (by decide) }⟩ : UInt64 }
|
|
#eval (3 : UInt64).val
|
|
#eval toString $ { toBitVec := ⟨{ val := 3, isLt := (match System.Platform.numBits, System.Platform.numBits_eq with | _, Or.inl rfl => (by decide) | _, Or.inr rfl => (by decide)) }⟩ : USize }
|
|
#eval (3 : USize).val
|
|
|
|
|
|
#eval toString $ { toBitVec := ⟨{ val := 4, isLt := (by decide) }⟩ : UInt8 }
|
|
#eval (4 : UInt8).val
|
|
#eval toString $ { toBitVec := ⟨{ val := 4, isLt := (by decide) }⟩ : UInt16 }
|
|
#eval (4 : UInt16).val
|
|
#eval toString $ { toBitVec := ⟨{ val := 4, isLt := (by decide) }⟩ : UInt32 }
|
|
#eval (4 : UInt32).val
|
|
#eval toString $ { toBitVec := ⟨{ val := 4, isLt := (by decide) }⟩ : UInt64 }
|
|
#eval (4 : UInt64).val
|
|
#eval toString $ { toBitVec := ⟨{ val := 4, isLt := (match System.Platform.numBits, System.Platform.numBits_eq with | _, Or.inl rfl => (by decide) | _, Or.inr rfl => (by decide)) }⟩ : USize }
|
|
#eval (4 : USize).val
|