diff options
| author |  Jason Gross <jgross@mit.edu> | 2016-02-25 13:46:07 -0500 |
|---|---|---|
| committer | Jason Gross <jgross@mit.edu> | 2016-02-25 13:46:07 -0500 |
| commit | f6733c0048eacc911feff5277fed12fb544c7299 (patch) | |
| tree | 95583abe859e3e9eae68727d3642d3d8bef703d0 /src/Spec/Encoding.v | |
| parent | 6dbfc76a2951a8f74b33a61f57fbe5b0d73c3352 (diff) | |
Factor out some bedrock dependencies into WordUtil
Also move a definition about words, with a TODO about location, into WordUtil.
Diffstat (limited to 'src/Spec/Encoding.v')
| -rw-r--r-- | src/Spec/Encoding.v | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Spec/Encoding.v b/src/Spec/Encoding.v index 95ac85c97..7bef9295b 100644 --- a/src/Spec/Encoding.v +++ b/src/Spec/Encoding.v @@ -4,6 +4,7 @@ Require Import Crypto.ModularArithmetic.PrimeFieldTheorems Crypto.ModularArithme Require Import Bedrock.Word. Require Import VerdiTactics. Require Import Crypto.Util.NatUtil. +Require Import Crypto.Util.WordUtil. Class Encoding (T B:Type) := { enc : T -> B ; @@ -33,7 +34,7 @@ Section ModularWordEncoding. rewrite <- Nnat.N2Nat.id. rewrite Npow2_nat. apply (Nat2N_inj_lt (Z.to_nat x) (pow2 sz)). - rewrite ZUtil.Zpow_pow2. + rewrite Zpow_pow2. destruct x_range as [x_low x_high]. apply Z2Nat.inj_lt in x_high; try omega. rewrite <- ZUtil.pow_Z2N_Zpow by omega. |