From b01eb633ff10c86025abee4712ea46480f609f81 Mon Sep 17 00:00:00 2001 From: Romain Dolbeau Date: Sat, 27 Aug 2022 08:32:38 +0200 Subject: [PATCH] ABI --- aeadaes256ocbtaglen128v1-rv32/Makefile | 2 +- aes256ctrstandalone-rv32/Makefile | 2 +- aes256decrypt-rv32/Makefile | 2 +- aes256encrypt-rv32/Makefile | 2 +- aes256gcmv1standalone-rv32/Makefile | 2 +- chacha20standalone-rv32/Makefile | 2 +- r5.mk | 8 ++++++-- sha256standalone-rv32/Makefile | 2 +- sha512standalone-rv32/Makefile | 2 +- 9 files changed, 14 insertions(+), 10 deletions(-) diff --git a/aeadaes256ocbtaglen128v1-rv32/Makefile b/aeadaes256ocbtaglen128v1-rv32/Makefile index 6489910..04c6321 100644 --- a/aeadaes256ocbtaglen128v1-rv32/Makefile +++ b/aeadaes256ocbtaglen128v1-rv32/Makefile @@ -37,4 +37,4 @@ kernelrandombytes.o: random.cpp $(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@ cpucycles.o: riscv.c - $(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@ + $(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@ diff --git a/aes256ctrstandalone-rv32/Makefile b/aes256ctrstandalone-rv32/Makefile index b148a0e..e7e1711 100644 --- a/aes256ctrstandalone-rv32/Makefile +++ b/aes256ctrstandalone-rv32/Makefile @@ -37,4 +37,4 @@ kernelrandombytes.o: random.cpp $(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@ cpucycles.o: riscv.c - $(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@ + $(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@ diff --git a/aes256decrypt-rv32/Makefile b/aes256decrypt-rv32/Makefile index 1370134..2cd42a5 100644 --- a/aes256decrypt-rv32/Makefile +++ b/aes256decrypt-rv32/Makefile @@ -37,4 +37,4 @@ kernelrandombytes.o: random.cpp $(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@ cpucycles.o: riscv.c - $(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@ + $(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@ diff --git a/aes256encrypt-rv32/Makefile b/aes256encrypt-rv32/Makefile index 81115e3..f703e46 100644 --- a/aes256encrypt-rv32/Makefile +++ b/aes256encrypt-rv32/Makefile @@ -37,4 +37,4 @@ kernelrandombytes.o: random.cpp $(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@ cpucycles.o: riscv.c - $(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@ + $(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@ diff --git a/aes256gcmv1standalone-rv32/Makefile b/aes256gcmv1standalone-rv32/Makefile index 216a21d..1786edc 100644 --- a/aes256gcmv1standalone-rv32/Makefile +++ b/aes256gcmv1standalone-rv32/Makefile @@ -37,4 +37,4 @@ kernelrandombytes.o: random.cpp $(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@ cpucycles.o: riscv.c - $(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@ + $(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@ diff --git a/chacha20standalone-rv32/Makefile b/chacha20standalone-rv32/Makefile index 7d99cca..166215c 100644 --- a/chacha20standalone-rv32/Makefile +++ b/chacha20standalone-rv32/Makefile @@ -40,7 +40,7 @@ kernelrandombytes.o: random.cpp $(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@ cpucycles.o: riscv.c - $(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@ + $(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@ chacha_XAR.S: chacha.c diff --git a/r5.mk b/r5.mk index 057745e..a45dd01 100644 --- a/r5.mk +++ b/r5.mk @@ -1,7 +1,11 @@ +R5ISA=rv32imafdc +R5ABI=ilp32d ## B Toolchain so we get some automatic B generation R5B_TOOLCHAIN=/opt/riscv64bk/ R5B_GCC=$(R5B_TOOLCHAIN)/bin/riscv64-unknown-elf-gcc -R5B_OPT=-Os -march=rv32imacb -mabi=ilp32 -I. +#R5B_TOOLCHAIN=/opt/rv32bk +#R5B_GCC=$(R5B_TOOLCHAIN)/bin/riscv32-buildroot-linux-gnu-gcc +R5B_OPT=-Os -march=$(R5ISA)b -mabi=$(R5ABI) -I. ## Buildroot toolchain for linking and having up-to-date libraries and systems calls ## Requires enabling C++ in buildroot with e.g. @@ -10,5 +14,5 @@ R5B_OPT=-Os -march=rv32imacb -mabi=ilp32 -I. R5IMA_TOOLCHAIN=/home/dolbeau2/LITEX/buildroot-rv32/output/host R5IMA_GCC=$(R5IMA_TOOLCHAIN)/bin/riscv32-buildroot-linux-gnu-gcc R5IMA_GXX=$(R5IMA_TOOLCHAIN)/bin/riscv32-buildroot-linux-gnu-g++ -R5IMA_OPT=-Os -march=rv32imac -mabi=ilp32 -I. +R5IMA_OPT=-Os -march=$(R5ISA) -mabi=$(R5ABI) -I. R5IMA_STRIP=$(R5IMA_TOOLCHAIN)/riscv32-buildroot-linux-gnu-strip diff --git a/sha256standalone-rv32/Makefile b/sha256standalone-rv32/Makefile index e1c1992..330ca3e 100644 --- a/sha256standalone-rv32/Makefile +++ b/sha256standalone-rv32/Makefile @@ -37,4 +37,4 @@ kernelrandombytes.o: random.cpp $(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@ cpucycles.o: riscv.c - $(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@ + $(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@ diff --git a/sha512standalone-rv32/Makefile b/sha512standalone-rv32/Makefile index e083914..6ab3f42 100644 --- a/sha512standalone-rv32/Makefile +++ b/sha512standalone-rv32/Makefile @@ -37,4 +37,4 @@ kernelrandombytes.o: random.cpp $(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@ cpucycles.o: riscv.c - $(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@ + $(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@