Skip to content

O
OpenXG-RAN
Commit e3aff6c3 authored by Raymond Knopp's avatar Raymond Knopp Committed by Robert Schmidt
Browse files
Options

fix in nr_modulation.c: avoid fail for 64QAM and G < 192 bits 

Adds a check for these short payloads and handle correctly
parent 92491310
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 42 deletions
openair1/PHY/MODULATION/nr_modulation.c
View file @ e3aff6c3
...@@ -123,7 +123,7 @@ void nr_modulation(uint32_t *in, ...@@ -123,7 +123,7 @@ void nr_modulation(uint32_t *in,
uint8_t* in_bytes = (uint8_t*) in; uint8_t* in_bytes = (uint8_t*) in;
uint64_t* in64 = (uint64_t*) in; uint64_t* in64 = (uint64_t*) in;
int64_t* out64 = (int64_t*) out; int64_t* out64 = (int64_t*) out;
uint32_t i; uint32_t i=0;
#if defined(__SSE2__) #if defined(__SSE2__)
simde__m128i *nr_mod_table128; simde__m128i *nr_mod_table128;
...@@ -173,47 +173,49 @@ void nr_modulation(uint32_t *in, ...@@ -173,47 +173,49 @@ void nr_modulation(uint32_t *in,
return; return;
case 6: case 6:
for (i = 0; i < length - 3 * 64; i += 3 * 64) { if (length > (3*64))
uint64_t x = *in64++; for (i = 0; i < length - 3 * 64; i += 3 * 64) {
uint64_t x1 = x & 0xfff; uint64_t x = *in64++;
*out64++ = nr_64qam_mod_table[x1]; uint64_t x1 = x & 0xfff;
x1 = (x >> 12) & 0xfff; *out64++ = nr_64qam_mod_table[x1];
*out64++ = nr_64qam_mod_table[x1]; x1 = (x >> 12) & 0xfff;
x1 = (x >> 24) & 0xfff; *out64++ = nr_64qam_mod_table[x1];
*out64++ = nr_64qam_mod_table[x1]; x1 = (x >> 24) & 0xfff;
x1 = (x >> 36) & 0xfff; *out64++ = nr_64qam_mod_table[x1];
*out64++ = nr_64qam_mod_table[x1]; x1 = (x >> 36) & 0xfff;
x1 = (x >> 48) & 0xfff; *out64++ = nr_64qam_mod_table[x1];
*out64++ = nr_64qam_mod_table[x1]; x1 = (x >> 48) & 0xfff;
uint64_t x2 = (x >> 60); *out64++ = nr_64qam_mod_table[x1];
x = *in64++; uint64_t x2 = (x >> 60);
x2 |= x<<4; x = *in64++;
x1 = x2 & 0xfff; x2 |= x<<4;
*out64++ = nr_64qam_mod_table[x1]; x1 = x2 & 0xfff;
x1 = (x2 >> 12) & 0xfff; *out64++ = nr_64qam_mod_table[x1];
*out64++ = nr_64qam_mod_table[x1]; x1 = (x2 >> 12) & 0xfff;
x1 = (x2 >> 24) & 0xfff; *out64++ = nr_64qam_mod_table[x1];
*out64++ = nr_64qam_mod_table[x1]; x1 = (x2 >> 24) & 0xfff;
x1 = (x2 >> 36) & 0xfff; *out64++ = nr_64qam_mod_table[x1];
*out64++ = nr_64qam_mod_table[x1]; x1 = (x2 >> 36) & 0xfff;
x1 = (x2 >> 48) & 0xfff; *out64++ = nr_64qam_mod_table[x1];
*out64++ = nr_64qam_mod_table[x1]; x1 = (x2 >> 48) & 0xfff;
x2 = ((x>>56)&0xf0) | (x2>>60); *out64++ = nr_64qam_mod_table[x1];
x = *in64++; x2 = ((x>>56)&0xf0) | (x2>>60);
x2 |= x<<8; x = *in64++;
x1 = x2 & 0xfff; x2 |= x<<8;
*out64++ = nr_64qam_mod_table[x1]; x1 = x2 & 0xfff;
x1 = (x2 >> 12) & 0xfff; *out64++ = nr_64qam_mod_table[x1];
*out64++ = nr_64qam_mod_table[x1]; x1 = (x2 >> 12) & 0xfff;
x1 = (x2 >> 24) & 0xfff; *out64++ = nr_64qam_mod_table[x1];
*out64++ = nr_64qam_mod_table[x1]; x1 = (x2 >> 24) & 0xfff;
x1 = (x2 >> 36) & 0xfff; *out64++ = nr_64qam_mod_table[x1];
*out64++ = nr_64qam_mod_table[x1]; x1 = (x2 >> 36) & 0xfff;
x1 = (x2 >> 48) & 0xfff; *out64++ = nr_64qam_mod_table[x1];
*out64++ = nr_64qam_mod_table[x1]; x1 = (x2 >> 48) & 0xfff;
x2 = ((x>>52)&0xff0) | (x2>>60); *out64++ = nr_64qam_mod_table[x1];
*out64++ = nr_64qam_mod_table[x2]; x2 = ((x>>52)&0xff0) | (x2>>60);
} *out64++ = nr_64qam_mod_table[x2];
}
while (i + 24 <= length) { while (i + 24 <= length) {
uint32_t xx = 0; uint32_t xx = 0;
memcpy(&xx, in_bytes + i / 8, 3); memcpy(&xx, in_bytes + i / 8, 3);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment