From 5341d79b8a0a618f7d1e3c715bdbd659554e9b25 Mon Sep 17 00:00:00 2001
From: Ismael Gomez <ismagom@gmail.com>
Date: Tue, 5 Sep 2017 10:54:36 +0200
Subject: [PATCH] Fix memory alignment in PUCCH processing. Fixes #94

---
 lib/include/srslte/phy/phch/uci.h |  8 +++++---
 lib/src/phy/phch/pucch.c          |  1 +
 lib/src/phy/phch/uci.c            | 17 ++++++++++++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/lib/include/srslte/phy/phch/uci.h b/lib/include/srslte/phy/phch/uci.h
index bad87866e..01eae8e89 100644
--- a/lib/include/srslte/phy/phch/uci.h
+++ b/lib/include/srslte/phy/phch/uci.h
@@ -57,8 +57,8 @@ typedef struct SRSLTE_API {
 } srslte_uci_cqi_pusch_t;
 
 typedef struct SRSLTE_API {
-  uint8_t cqi_table[16][32];
-  int16_t cqi_table_s[16][32]; // aligned for simd
+  uint8_t *cqi_table[16];
+  int16_t *cqi_table_s[16];
 } srslte_uci_cqi_pucch_t;
 
 typedef struct SRSLTE_API {
@@ -85,7 +85,9 @@ typedef struct {
 
 SRSLTE_API void srslte_uci_cqi_pucch_init(srslte_uci_cqi_pucch_t *q);
 
-SRSLTE_API int srslte_uci_encode_cqi_pucch(uint8_t *cqi_data, 
+SRSLTE_API void srslte_uci_cqi_pucch_free(srslte_uci_cqi_pucch_t *q);
+
+SRSLTE_API int srslte_uci_encode_cqi_pucch(uint8_t *cqi_data,
                                            uint32_t cqi_len, 
                                            uint8_t b_bits[SRSLTE_UCI_CQI_CODED_PUCCH_B]);
 
diff --git a/lib/src/phy/phch/pucch.c b/lib/src/phy/phch/pucch.c
index 70b500cd0..56349dee4 100644
--- a/lib/src/phy/phch/pucch.c
+++ b/lib/src/phy/phch/pucch.c
@@ -465,6 +465,7 @@ void srslte_pucch_free(srslte_pucch_t *q) {
     }
     free(q->users);
   }
+  srslte_uci_cqi_pucch_free(&q->cqi);
   if (q->z) {
     free(q->z);
   }
diff --git a/lib/src/phy/phch/uci.c b/lib/src/phy/phch/uci.c
index 5bf40cc17..3b22eb792 100644
--- a/lib/src/phy/phch/uci.c
+++ b/lib/src/phy/phch/uci.c
@@ -32,6 +32,7 @@
 #include <stdbool.h>
 #include <assert.h>
 #include <math.h>
+#include <srslte/phy/phch/uci.h>
 
 #include "srslte/phy/phch/uci.h"
 #include "srslte/phy/fec/cbsegm.h"
@@ -109,7 +110,9 @@ void srslte_uci_cqi_pucch_init(srslte_uci_cqi_pucch_t *q) {
     
   uint32_t nwords      = 16;
   for (uint32_t w=0;w<nwords;w++) {
-    uint8_t *ptr = word; 
+    q->cqi_table[w]   = srslte_vec_malloc(SRSLTE_UCI_CQI_CODED_PUCCH_B*sizeof(int8_t));
+    q->cqi_table_s[w] = srslte_vec_malloc(SRSLTE_UCI_CQI_CODED_PUCCH_B*sizeof(int16_t));
+    uint8_t *ptr = word;
     srslte_bit_unpack(w, &ptr, 4);
     srslte_uci_encode_cqi_pucch(word, 4, q->cqi_table[w]);    
     for (int j=0;j<SRSLTE_UCI_CQI_CODED_PUCCH_B;j++) {
@@ -118,6 +121,18 @@ void srslte_uci_cqi_pucch_init(srslte_uci_cqi_pucch_t *q) {
   }
 }
 
+void srslte_uci_cqi_pucch_free(srslte_uci_cqi_pucch_t *q) {
+  uint32_t nwords      = 16;
+  for (uint32_t w=0;w<nwords;w++) {
+    if (q->cqi_table[w]) {
+      free(q->cqi_table[w]);
+    }
+    if (q->cqi_table_s[w]) {
+      free(q->cqi_table_s[w]);
+    }
+  }
+}
+
 /* Encode UCI CQI/PMI as described in 5.2.3.3 of 36.212 
  */
 int srslte_uci_encode_cqi_pucch(uint8_t *cqi_data, uint32_t cqi_len, uint8_t b_bits[SRSLTE_UCI_CQI_CODED_PUCCH_B])