mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: remove bit field demux in datatrak.c

Browse source 
To test single bits, datatrak.c would transform bytes into
malloc()ed char[8] buffers. Instead, simply introduce a function
to test individual bits. This should make it distinctly easier for
the compiler to optimize away.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-03-18 14:27:25 +01:00 • committed by Dirk Hohndel
parent 6c561b33d7
commit 2cbc393f4d
1 changed files with 25 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
core/datatrak.c
View file

@ -6,6 +6,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stdbool.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include "gettext.h" #include "gettext.h"
@ -26,13 +27,9 @@ static unsigned long four_bytes_to_long(unsigned char x, unsigned char y, unsign
return ((long)x << 24) + ((long)y << 16) + ((long)z << 8) + (long)t; return ((long)x << 24) + ((long)y << 16) + ((long)z << 8) + (long)t;
} }
static unsigned char *byte_to_bits(unsigned char byte_value) static bool bit_set(unsigned char byte, int bit)
{ {
unsigned char i, *bits = (unsigned char *)malloc(8); return byte & (1 << bit);
for (i = 0; i < 8; i++)
bits[i] = byte_value & (1 << i);
return bits;
} }
/* /*
@ -151,7 +148,7 @@ static unsigned char *dt_dive_parser(unsigned char *runner, struct dive *dt_dive
*compl_buffer, *compl_buffer,
*membuf = runner; *membuf = runner;
char buffer[1024]; char buffer[1024];
unsigned char tmp_1byte, *byte; unsigned char tmp_1byte;
unsigned int tmp_2bytes; unsigned int tmp_2bytes;
unsigned long tmp_4bytes; unsigned long tmp_4bytes;
struct dive_site *ds; struct dive_site *ds;
@ -361,76 +358,68 @@ static unsigned char *dt_dive_parser(unsigned char *runner, struct dive *dt_dive
* will use tags. Bits 0 and 1 are not used. Reuse coincident tags. * will use tags. Bits 0 and 1 are not used. Reuse coincident tags.
*/ */
read_bytes(1); read_bytes(1);
byte = byte_to_bits(tmp_1byte); if (bit_set(tmp_1byte, 2))
if (byte[2] != 0)
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "no stop"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "no stop")));
if (byte[3] != 0) if (bit_set(tmp_1byte, 3))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "deco"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "deco")));
if (byte[4] != 0) if (bit_set(tmp_1byte, 4))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "single ascent"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "single ascent")));
if (byte[5] != 0) if (bit_set(tmp_1byte, 5))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "multiple ascent"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "multiple ascent")));
if (byte[6] != 0) if (bit_set(tmp_1byte, 6))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "fresh water"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "fresh water")));
if (byte[7] != 0) if (bit_set(tmp_1byte, 7))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "salt water"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "salt water")));
free(byte);
/* /*
* Dive Type 2 - Bit table, use tags again * Dive Type 2 - Bit table, use tags again
*/ */
read_bytes(1); read_bytes(1);
byte = byte_to_bits(tmp_1byte); if (bit_set(tmp_1byte, 0)) {
if (byte[0] != 0) {
taglist_add_tag(&dt_dive->tag_list, strdup("nitrox")); taglist_add_tag(&dt_dive->tag_list, strdup("nitrox"));
is_nitrox = 1; is_nitrox = 1;
} }
if (byte[1] != 0) { if (bit_set(tmp_1byte, 1)) {
taglist_add_tag(&dt_dive->tag_list, strdup("rebreather")); taglist_add_tag(&dt_dive->tag_list, strdup("rebreather"));
is_SCR = 1; is_SCR = 1;
dt_dive->dc.divemode = PSCR; dt_dive->dc.divemode = PSCR;
} }
free(byte);
/* /*
* Dive Activity 1 - Bit table, use tags again * Dive Activity 1 - Bit table, use tags again
*/ */
read_bytes(1); read_bytes(1);
byte = byte_to_bits(tmp_1byte); if (bit_set(tmp_1byte, 0))
if (byte[0] != 0)
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "sight seeing"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "sight seeing")));
if (byte[1] != 0) if (bit_set(tmp_1byte, 1))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "club dive"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "club dive")));
if (byte[2] != 0) if (bit_set(tmp_1byte, 2))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "instructor"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "instructor")));
if (byte[3] != 0) if (bit_set(tmp_1byte, 3))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "instruction"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "instruction")));
if (byte[4] != 0) if (bit_set(tmp_1byte, 4))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "night"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "night")));
if (byte[5] != 0) if (bit_set(tmp_1byte, 5))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "cave"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "cave")));
if (byte[6] != 0) if (bit_set(tmp_1byte, 6))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "ice"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "ice")));
if (byte[7] != 0) if (bit_set(tmp_1byte, 7))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "search"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "search")));
free(byte);
/* /*
* Dive Activity 2 - Bit table, use tags again * Dive Activity 2 - Bit table, use tags again
*/ */
read_bytes(1); read_bytes(1);
byte = byte_to_bits(tmp_1byte); if (bit_set(tmp_1byte, 0))
if (byte[0] != 0)
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "wreck"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "wreck")));
if (byte[1] != 0) if (bit_set(tmp_1byte, 1))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "river"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "river")));
if (byte[2] != 0) if (bit_set(tmp_1byte, 2))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "drift"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "drift")));
if (byte[3] != 0) if (bit_set(tmp_1byte, 3))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "photo"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "photo")));
if (byte[4] != 0) if (bit_set(tmp_1byte, 4))
taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "other"))); taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC", "other")));
free(byte);
/* /*
* Other activities - String 1st byte = long * Other activities - String 1st byte = long