Merge pull request #6156 from daverodgman/microblaze-littleendian-bac…

…kport-2.28 Microblaze littleendian backport 2.28
Mbed-TLS · Jul 29, 2022 · 62067bc · 62067bc
2 parents 8934db7 + 7d4a8da
commit 62067bc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/ChangeLog.d/muladdc_microblaze.txt b/ChangeLog.d/muladdc_microblaze.txt
@@ -0,0 +1,3 @@
+Bugfix
+ * Fix support for little-endian Microblaze when MBEDTLS_HAVE_ASM is defined.
+ Contributed by Kazuyuki Kimura to fix #2020.
diff --git a/include/mbedtls/bn_mul.h b/include/mbedtls/bn_mul.h
@@ -579,10 +579,20 @@
  "andi r7, r6, 0xffff \n\t" \
  "bsrli r6, r6, 16 \n\t"
 
-#define MULADDC_CORE \
+#if(__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+#define MULADDC_LHUI \
+ "lhui r9, r3, 0 \n\t" \
+ "addi r3, r3, 2 \n\t" \
+ "lhui r8, r3, 0 \n\t"
+#else
+#define MULADDC_LHUI \
  "lhui r8, r3, 0 \n\t" \
  "addi r3, r3, 2 \n\t" \
- "lhui r9, r3, 0 \n\t" \
+ "lhui r9, r3, 0 \n\t"
+#endif
+
+#define MULADDC_CORE \
+ MULADDC_LHUI \
  "addi r3, r3, 2 \n\t" \
  "mul r10, r9, r6 \n\t" \
  "mul r11, r8, r7 \n\t" \