fix: fixes #619 help go mod vendor to include files

[gbotrel]

Description

Fixes #619 .

Idea is just to hint to go mod vendor to include some assembly file by making it believe the subfolders in asm are actual go packages.
(in fact they just contains dummy constants and code that won't be linked, but the .s files are "included" à-la-C-preprocessor into other .s files)

[ivokub]

Suggested edit:

diff --git a/field/asm/.gitignore b/field/asm/.gitignore
index d21c226a7..d9d3470d3 100644
--- a/field/asm/.gitignore
+++ b/field/asm/.gitignore
@@ -1,5 +1,7 @@
 # generated by integration tests
-element_2w/**
-element_3w/**
-element_7w/**
-element_8w/**
\ No newline at end of file
+element_4w/**
+element_5w/**
+element_6w/**
+element_10w/**
+element_12w/**
+element_31b/**
\ No newline at end of file

[ivokub]

Suggested edit:

diff --git a/field/generator/asm/amd64/build.go b/field/generator/asm/amd64/build.go
index 41219d576..a63a1f6cb 100644
--- a/field/generator/asm/amd64/build.go
+++ b/field/generator/asm/amd64/build.go
@@ -284,7 +284,7 @@ func ElementASMFileName(nbWords, nbBits int) string {
 	const fWN = "element_%dw"
 
 	if nbWords == 1 {
-		return filepath.Join(fmt.Sprintf(fW1, 31), fmt.Sprintf(nameW1, 31))
+		return filepath.Join(fmt.Sprintf(fW1, nbBits), fmt.Sprintf(nameW1, nbBits))
 	}
 	return filepath.Join(fmt.Sprintf(fWN, nbWords), fmt.Sprintf(nameWN, nbWords))
 }
@@ -294,7 +294,7 @@ func ElementASMBaseDir(nbWords, nbBits int) string {
 	const fWN = "element_%dw"
 
 	if nbWords == 1 {
-		return fmt.Sprintf(fW1, 31)
+		return fmt.Sprintf(fW1, nbBits)
 	}
 	return fmt.Sprintf(fWN, nbWords)
 }
diff --git a/field/generator/asm/arm64/build.go b/field/generator/asm/arm64/build.go
index d6f035551..1fb96c9f1 100644
--- a/field/generator/asm/arm64/build.go
+++ b/field/generator/asm/arm64/build.go
@@ -220,7 +220,7 @@ func ElementASMFileName(nbWords, nbBits int) string {
 	const fW1 = "element_%db"
 	const fWN = "element_%dw"
 	if nbWords == 1 {
-		return filepath.Join(fmt.Sprintf(fW1, 31), fmt.Sprintf(nameW1, 31))
+		return filepath.Join(fmt.Sprintf(fW1, nbBits), fmt.Sprintf(nameW1, nbBits))
 	}
 	return filepath.Join(fmt.Sprintf(fWN, nbWords), fmt.Sprintf(nameWN, nbWords))
 }

[ivokub]

See suggests and a single comment. Otherwise looks perfect. I also tried out in an empty project and solves the issue.

[gbotrel]

Suggested edit:

diff --git a/field/asm/.gitignore b/field/asm/.gitignore
index d21c226a7..d9d3470d3 100644
--- a/field/asm/.gitignore
+++ b/field/asm/.gitignore
@@ -1,5 +1,7 @@
 # generated by integration tests
-element_2w/**
-element_3w/**
-element_7w/**
-element_8w/**
\ No newline at end of file
+element_4w/**
+element_5w/**
+element_6w/**
+element_10w/**
+element_12w/**
+element_31b/**
\ No newline at end of file

can't do, we need 4w etc they are imported :-)