From 3f48a590e87c069e9b3837d02633b2b88d8fcd21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mamy=20Andr=C3=A9-Ratsimbazafy?= Date: Sun, 27 Sep 2020 17:25:21 +0200 Subject: [PATCH] Move assembly to their own folder --- .../{ => assembly}/limbs_asm_modular_dbl_width_x86.nim | 4 ++-- .../arithmetic/{ => assembly}/limbs_asm_modular_x86.nim | 6 +++--- .../arithmetic/{ => assembly}/limbs_asm_montmul_x86.nim | 6 +++--- .../{ => assembly}/limbs_asm_montmul_x86_adx_bmi2.nim | 6 +++--- .../arithmetic/{ => assembly}/limbs_asm_montred_x86.nim | 6 +++--- .../{ => assembly}/limbs_asm_montred_x86_adx_bmi2.nim | 6 +++--- constantine/arithmetic/{ => assembly}/limbs_asm_mul_x86.nim | 4 ++-- .../{ => assembly}/limbs_asm_mul_x86_adx_bmi2.nim | 4 ++-- constantine/arithmetic/{ => assembly}/limbs_asm_x86.nim | 4 ++-- constantine/arithmetic/finite_fields.nim | 2 +- constantine/arithmetic/finite_fields_double_width.nim | 2 +- constantine/arithmetic/limbs.nim | 6 +++--- constantine/arithmetic/limbs_double_width.nim | 4 ++-- constantine/arithmetic/limbs_montgomery.nim | 4 ++-- 14 files changed, 32 insertions(+), 32 deletions(-) rename constantine/arithmetic/{ => assembly}/limbs_asm_modular_dbl_width_x86.nim (98%) rename constantine/arithmetic/{ => assembly}/limbs_asm_modular_x86.nim (99%) rename constantine/arithmetic/{ => assembly}/limbs_asm_montmul_x86.nim (99%) rename constantine/arithmetic/{ => assembly}/limbs_asm_montmul_x86_adx_bmi2.nim (99%) rename constantine/arithmetic/{ => assembly}/limbs_asm_montred_x86.nim (99%) rename constantine/arithmetic/{ => assembly}/limbs_asm_montred_x86_adx_bmi2.nim (98%) rename constantine/arithmetic/{ => assembly}/limbs_asm_mul_x86.nim (98%) rename constantine/arithmetic/{ => assembly}/limbs_asm_mul_x86_adx_bmi2.nim (99%) rename constantine/arithmetic/{ => assembly}/limbs_asm_x86.nim (99%) diff --git a/constantine/arithmetic/limbs_asm_modular_dbl_width_x86.nim b/constantine/arithmetic/assembly/limbs_asm_modular_dbl_width_x86.nim similarity index 98% rename from constantine/arithmetic/limbs_asm_modular_dbl_width_x86.nim rename to constantine/arithmetic/assembly/limbs_asm_modular_dbl_width_x86.nim index 96ee717..ed49566 100644 --- a/constantine/arithmetic/limbs_asm_modular_dbl_width_x86.nim +++ b/constantine/arithmetic/assembly/limbs_asm_modular_dbl_width_x86.nim @@ -10,8 +10,8 @@ import # Standard library std/macros, # Internal - ../config/common, - ../primitives + ../../config/common, + ../../primitives # ############################################################ # diff --git a/constantine/arithmetic/limbs_asm_modular_x86.nim b/constantine/arithmetic/assembly/limbs_asm_modular_x86.nim similarity index 99% rename from constantine/arithmetic/limbs_asm_modular_x86.nim rename to constantine/arithmetic/assembly/limbs_asm_modular_x86.nim index 05c0aff..d0cf94e 100644 --- a/constantine/arithmetic/limbs_asm_modular_x86.nim +++ b/constantine/arithmetic/assembly/limbs_asm_modular_x86.nim @@ -10,9 +10,9 @@ import # Standard library std/macros, # Internal - ../config/common, - ../primitives, - ./limbs + ../../config/common, + ../../primitives, + ../limbs # ############################################################ # diff --git a/constantine/arithmetic/limbs_asm_montmul_x86.nim b/constantine/arithmetic/assembly/limbs_asm_montmul_x86.nim similarity index 99% rename from constantine/arithmetic/limbs_asm_montmul_x86.nim rename to constantine/arithmetic/assembly/limbs_asm_montmul_x86.nim index 8a50584..6301526 100644 --- a/constantine/arithmetic/limbs_asm_montmul_x86.nim +++ b/constantine/arithmetic/assembly/limbs_asm_montmul_x86.nim @@ -10,9 +10,9 @@ import # Standard library std/macros, # Internal - ../config/common, - ../primitives, - ./limbs, + ../../config/common, + ../../primitives, + ../limbs, ./limbs_asm_montred_x86 # ############################################################ diff --git a/constantine/arithmetic/limbs_asm_montmul_x86_adx_bmi2.nim b/constantine/arithmetic/assembly/limbs_asm_montmul_x86_adx_bmi2.nim similarity index 99% rename from constantine/arithmetic/limbs_asm_montmul_x86_adx_bmi2.nim rename to constantine/arithmetic/assembly/limbs_asm_montmul_x86_adx_bmi2.nim index db6b85a..88c8ce3 100644 --- a/constantine/arithmetic/limbs_asm_montmul_x86_adx_bmi2.nim +++ b/constantine/arithmetic/assembly/limbs_asm_montmul_x86_adx_bmi2.nim @@ -10,9 +10,9 @@ import # Standard library std/macros, # Internal - ../config/common, - ../primitives, - ./limbs, + ../../config/common, + ../../primitives, + ../limbs, ./limbs_asm_montred_x86 # ############################################################ diff --git a/constantine/arithmetic/limbs_asm_montred_x86.nim b/constantine/arithmetic/assembly/limbs_asm_montred_x86.nim similarity index 99% rename from constantine/arithmetic/limbs_asm_montred_x86.nim rename to constantine/arithmetic/assembly/limbs_asm_montred_x86.nim index a696812..a0887c0 100644 --- a/constantine/arithmetic/limbs_asm_montred_x86.nim +++ b/constantine/arithmetic/assembly/limbs_asm_montred_x86.nim @@ -10,9 +10,9 @@ import # Standard library std/macros, # Internal - ../config/common, - ../primitives, - ./limbs + ../../config/common, + ../../primitives, + ../limbs # ############################################################ # diff --git a/constantine/arithmetic/limbs_asm_montred_x86_adx_bmi2.nim b/constantine/arithmetic/assembly/limbs_asm_montred_x86_adx_bmi2.nim similarity index 98% rename from constantine/arithmetic/limbs_asm_montred_x86_adx_bmi2.nim rename to constantine/arithmetic/assembly/limbs_asm_montred_x86_adx_bmi2.nim index 442cd34..6771785 100644 --- a/constantine/arithmetic/limbs_asm_montred_x86_adx_bmi2.nim +++ b/constantine/arithmetic/assembly/limbs_asm_montred_x86_adx_bmi2.nim @@ -10,9 +10,9 @@ import # Standard library std/macros, # Internal - ../config/common, - ../primitives, - ./limbs, + ../../config/common, + ../../primitives, + ../limbs, ./limbs_asm_montred_x86 # ############################################################ diff --git a/constantine/arithmetic/limbs_asm_mul_x86.nim b/constantine/arithmetic/assembly/limbs_asm_mul_x86.nim similarity index 98% rename from constantine/arithmetic/limbs_asm_mul_x86.nim rename to constantine/arithmetic/assembly/limbs_asm_mul_x86.nim index 64a12e3..72ff595 100644 --- a/constantine/arithmetic/limbs_asm_mul_x86.nim +++ b/constantine/arithmetic/assembly/limbs_asm_mul_x86.nim @@ -10,8 +10,8 @@ import # Standard library std/macros, # Internal - ../config/common, - ../primitives + ../../config/common, + ../../primitives # ############################################################ # diff --git a/constantine/arithmetic/limbs_asm_mul_x86_adx_bmi2.nim b/constantine/arithmetic/assembly/limbs_asm_mul_x86_adx_bmi2.nim similarity index 99% rename from constantine/arithmetic/limbs_asm_mul_x86_adx_bmi2.nim rename to constantine/arithmetic/assembly/limbs_asm_mul_x86_adx_bmi2.nim index dcc9042..c5c2aa7 100644 --- a/constantine/arithmetic/limbs_asm_mul_x86_adx_bmi2.nim +++ b/constantine/arithmetic/assembly/limbs_asm_mul_x86_adx_bmi2.nim @@ -10,8 +10,8 @@ import # Standard library std/macros, # Internal - ../config/common, - ../primitives + ../../config/common, + ../../primitives # ############################################################ # diff --git a/constantine/arithmetic/limbs_asm_x86.nim b/constantine/arithmetic/assembly/limbs_asm_x86.nim similarity index 99% rename from constantine/arithmetic/limbs_asm_x86.nim rename to constantine/arithmetic/assembly/limbs_asm_x86.nim index 79bf47f..8a73176 100644 --- a/constantine/arithmetic/limbs_asm_x86.nim +++ b/constantine/arithmetic/assembly/limbs_asm_x86.nim @@ -10,8 +10,8 @@ import # Standard library std/macros, # Internal - ../config/common, - ../primitives + ../../config/common, + ../../primitives # ############################################################ # diff --git a/constantine/arithmetic/finite_fields.nim b/constantine/arithmetic/finite_fields.nim index 44084a1..9b7e13d 100644 --- a/constantine/arithmetic/finite_fields.nim +++ b/constantine/arithmetic/finite_fields.nim @@ -31,7 +31,7 @@ import ./bigints, ./limbs_montgomery when UseASM_X86_64: - import ./limbs_asm_modular_x86 + import ./assembly/limbs_asm_modular_x86 when nimvm: from ../config/precompute import montyResidue_precompute diff --git a/constantine/arithmetic/finite_fields_double_width.nim b/constantine/arithmetic/finite_fields_double_width.nim index 523c744..3efaaba 100644 --- a/constantine/arithmetic/finite_fields_double_width.nim +++ b/constantine/arithmetic/finite_fields_double_width.nim @@ -15,7 +15,7 @@ import ./limbs_double_width when UseASM_X86_64: - import limbs_asm_modular_dbl_width_x86 + import assembly/limbs_asm_modular_dbl_width_x86 type FpDbl*[C: static Curve] = object ## Double-width Fp element diff --git a/constantine/arithmetic/limbs.nim b/constantine/arithmetic/limbs.nim index 224f4e0..6364d05 100644 --- a/constantine/arithmetic/limbs.nim +++ b/constantine/arithmetic/limbs.nim @@ -11,10 +11,10 @@ import ../primitives when UseASM_X86_32: - import ./limbs_asm_x86 + import ./assembly/limbs_asm_x86 when UseASM_X86_64: - import ./limbs_asm_mul_x86 - import ./limbs_asm_mul_x86_adx_bmi2 + import ./assembly/limbs_asm_mul_x86 + import ./assembly/limbs_asm_mul_x86_adx_bmi2 # ############################################################ # diff --git a/constantine/arithmetic/limbs_double_width.nim b/constantine/arithmetic/limbs_double_width.nim index 2193116..098852c 100644 --- a/constantine/arithmetic/limbs_double_width.nim +++ b/constantine/arithmetic/limbs_double_width.nim @@ -12,9 +12,9 @@ import ./limbs when UseASM_X86_32: - import ./limbs_asm_montred_x86 + import ./assembly/limbs_asm_montred_x86 when UseASM_X86_64: - import ./limbs_asm_montred_x86_adx_bmi2 + import ./assembly/limbs_asm_montred_x86_adx_bmi2 # ############################################################ # diff --git a/constantine/arithmetic/limbs_montgomery.nim b/constantine/arithmetic/limbs_montgomery.nim index c6e53f4..00ab974 100644 --- a/constantine/arithmetic/limbs_montgomery.nim +++ b/constantine/arithmetic/limbs_montgomery.nim @@ -16,8 +16,8 @@ import when UseASM_X86_64: import - ./limbs_asm_montmul_x86, - ./limbs_asm_montmul_x86_adx_bmi2 + ./assembly/limbs_asm_montmul_x86, + ./assembly/limbs_asm_montmul_x86_adx_bmi2 # ############################################################ #