commit e4f02c12518c0fe8154950b2e34c56a92721626e
author Kevin O'Connor <kevin@koconnor.net> Thu Jan 13 11:12:35 2022 -0500
committer Kevin O'Connor <kevin@koconnor.net> Fri Jan 21 11:08:33 2022 -0500
tree a781845613279d7e689c0b6285a2e4269f556163
parent 6a62e0cb0dfe9cd28b70547dbea5caf76847c3a9

smm: Suppress gcc array-bounds warnings

Add a hack to suppress spurious gcc array-bounds warning (on at least
gcc v11).

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Tested-by: Paul Menzel <pmenzel@molgen.mpg.de>

src/fw/smm.c

diff --git a/src/fw/smm.c b/src/fw/smm.c
index d90e43a..a0b50b2 100644
--- a/src/fw/smm.c
+++ b/src/fw/smm.c
@@ -59,6 +59,14 @@
     struct smm_state cpu;
 };
 
+// Hack to supress some gcc array-bounds warnings
+static void
+memcpy_nowarn(void *d, const void *s, size_t len)
+{
+    asm("" : "+r"(d), "+r"(s));
+    memcpy(d, s, len);
+}
+
 void VISIBLE32FLAT
 handle_smi(u16 cs)
 {
@@ -85,8 +93,8 @@
         if (CONFIG_CALL32_SMM) {
             // Backup current cpu state for SMM trampolining
             struct smm_layout *newsmm = (void*)BUILD_SMM_ADDR;
-            memcpy(&newsmm->backup1, &smm->cpu, sizeof(newsmm->backup1));
-            memcpy(&newsmm->backup2, &smm->cpu, sizeof(newsmm->backup2));
+            memcpy_nowarn(&newsmm->backup1, &smm->cpu, sizeof(newsmm->backup1));
+            memcpy_nowarn(&newsmm->backup2, &smm->cpu, sizeof(newsmm->backup2));
             HaveSmmCall32 = 1;
         }
 
@@ -145,8 +153,8 @@
     // save original memory content
     struct smm_layout *initsmm = (void*)BUILD_SMM_INIT_ADDR;
     struct smm_layout *smm = (void*)BUILD_SMM_ADDR;
-    memcpy(&smm->cpu, &initsmm->cpu, sizeof(smm->cpu));
-    memcpy(&smm->codeentry, &initsmm->codeentry, sizeof(smm->codeentry));
+    memcpy_nowarn(&smm->cpu, &initsmm->cpu, sizeof(smm->cpu));
+    memcpy_nowarn(&smm->codeentry, &initsmm->codeentry, sizeof(smm->codeentry));
 
     // Setup code entry point.
     initsmm->codeentry = SMI_INSN;
@@ -168,8 +176,9 @@
     /* restore original memory content */
     struct smm_layout *initsmm = (void*)BUILD_SMM_INIT_ADDR;
     struct smm_layout *smm = (void*)BUILD_SMM_ADDR;
-    memcpy(&initsmm->cpu, &smm->cpu, sizeof(initsmm->cpu));
-    memcpy(&initsmm->codeentry, &smm->codeentry, sizeof(initsmm->codeentry));
+    memcpy_nowarn(&initsmm->cpu, &smm->cpu, sizeof(initsmm->cpu));
+    memcpy_nowarn(&initsmm->codeentry, &smm->codeentry
+                  , sizeof(initsmm->codeentry));
 
     // Setup code entry point.
     smm->codeentry = SMI_INSN;