Merge remote-tracking branch 'origin' into experimental_command_streams
This commit is contained in:
nemerle
commit
8875371cee
@ -1,2 +1,4 @@
|
||||
add_subdirectory(dispsrch)
|
||||
add_subdirectory(makedsig)
|
||||
add_subdirectory(readsig)
|
||||
add_subdirectory(parsehdr)
|
||||
|
||||
9
tools/dispsrch/CMakeLists.txt
Normal file
9
tools/dispsrch/CMakeLists.txt
Normal file
@ -0,0 +1,9 @@
|
||||
add_executable(dispsig dispsig)
|
||||
|
||||
target_link_libraries(dispsig dcc_hash)
|
||||
qt5_use_modules(dispsig Core)
|
||||
|
||||
add_executable(srchsig srchsig)
|
||||
|
||||
target_link_libraries(srchsig dcc_hash dcc_lib)
|
||||
qt5_use_modules(srchsig Core)
|
||||
@ -1,191 +1,164 @@
|
||||
/* Quick program to copy a named signature to a small file */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <memory.h>
|
||||
#include <string.h>
|
||||
#include "perfhlib.h"
|
||||
|
||||
/* statics */
|
||||
byte buf[100];
|
||||
int numKeys; /* Number of hash table entries (keys) */
|
||||
int numVert; /* Number of vertices in the graph (also size of g[]) */
|
||||
int PatLen; /* Size of the keys (pattern length) */
|
||||
int SymLen; /* Max size of the symbols, including null */
|
||||
FILE *f; /* File being read */
|
||||
FILE *f2; /* File being written */
|
||||
#include <QtCore/QString>
|
||||
#include <memory.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
static word *T1base, *T2base; /* Pointers to start of T1, T2 */
|
||||
static word *g; /* g[] */
|
||||
/* statics */
|
||||
uint8_t buf[100];
|
||||
int numKeys; /* Number of hash table entries (keys) */
|
||||
int numVert; /* Number of vertices in the graph (also size of g[]) */
|
||||
int PatLen; /* Size of the keys (pattern length) */
|
||||
int SymLen; /* Max size of the symbols, including null */
|
||||
FILE *f; /* File being read */
|
||||
FILE *f2; /* File being written */
|
||||
|
||||
static uint16_t *T1base, *T2base; /* Pointers to start of T1, T2 */
|
||||
static uint16_t *g; /* g[] */
|
||||
|
||||
/* prototypes */
|
||||
void grab(int n);
|
||||
word readFileShort(void);
|
||||
uint16_t readFileShort(void);
|
||||
void cleanup(void);
|
||||
|
||||
|
||||
#define SYMLEN 16
|
||||
#define PATLEN 23
|
||||
#define SYMLEN 16
|
||||
#define PATLEN 23
|
||||
|
||||
/* Hash table structure */
|
||||
typedef struct HT_tag
|
||||
{
|
||||
char htSym[SYMLEN];
|
||||
byte htPat[PATLEN];
|
||||
typedef struct HT_tag {
|
||||
char htSym[SYMLEN];
|
||||
uint8_t htPat[PATLEN];
|
||||
} HT;
|
||||
|
||||
HT ht; /* One hash table entry */
|
||||
HT ht; /* One hash table entry */
|
||||
PerfectHash g_pattern_hasher;
|
||||
int main(int argc, char *argv[]) {
|
||||
uint16_t w, len;
|
||||
int i;
|
||||
|
||||
void
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
word w, len;
|
||||
int i;
|
||||
if (argc <= 3) {
|
||||
printf("Usage: dispsig <SigFilename> <FunctionName> <BinFileName>\n");
|
||||
printf("Example: dispsig dccm8s.sig printf printf.bin\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (argc <= 3)
|
||||
{
|
||||
printf("Usage: dispsig <SigFilename> <FunctionName> <BinFileName>\n");
|
||||
printf("Example: dispsig dccm8s.sig printf printf.bin\n");
|
||||
exit(1);
|
||||
}
|
||||
if ((f = fopen(argv[1], "rb")) == NULL) {
|
||||
printf("Cannot open %s\n", argv[1]);
|
||||
exit(2);
|
||||
}
|
||||
|
||||
if ((f = fopen(argv[1], "rb")) == NULL)
|
||||
{
|
||||
printf("Cannot open %s\n", argv[1]);
|
||||
exit(2);
|
||||
}
|
||||
if ((f2 = fopen(argv[3], "wb")) == NULL) {
|
||||
printf("Cannot write to %s\n", argv[3]);
|
||||
exit(2);
|
||||
}
|
||||
|
||||
if ((f2 = fopen(argv[3], "wb")) == NULL)
|
||||
{
|
||||
printf("Cannot write to %s\n", argv[3]);
|
||||
exit(2);
|
||||
}
|
||||
/* Read the parameters */
|
||||
grab(4);
|
||||
if (memcmp("dccs", buf, 4) != 0) {
|
||||
printf("Not a dccs file!\n");
|
||||
exit(3);
|
||||
}
|
||||
numKeys = readFileShort();
|
||||
numVert = readFileShort();
|
||||
PatLen = readFileShort();
|
||||
SymLen = readFileShort();
|
||||
|
||||
/* Initialise the perfhlib stuff. Also allocates T1, T2, g, etc */
|
||||
g_pattern_hasher.setHashParams(
|
||||
numKeys, /* The number of symbols */
|
||||
PatLen, /* The length of the pattern to be hashed */
|
||||
256, /* The character set of the pattern (0-FF) */
|
||||
0, /* Minimum pattern character value */
|
||||
numVert); /* Specifies C, the sparseness of the graph. See Czech, Havas and Majewski for details */
|
||||
|
||||
T1base = g_pattern_hasher.readT1();
|
||||
T2base = g_pattern_hasher.readT2();
|
||||
g = g_pattern_hasher.readG();
|
||||
|
||||
|
||||
/* Read the parameters */
|
||||
grab(4);
|
||||
if (memcmp("dccs", buf, 4) != 0)
|
||||
{
|
||||
printf("Not a dccs file!\n");
|
||||
exit(3);
|
||||
}
|
||||
numKeys = readFileShort();
|
||||
numVert = readFileShort();
|
||||
PatLen = readFileShort();
|
||||
SymLen = readFileShort();
|
||||
/* Read T1 and T2 tables */
|
||||
grab(2);
|
||||
if (memcmp("T1", buf, 2) != 0) {
|
||||
printf("Expected 'T1'\n");
|
||||
exit(3);
|
||||
}
|
||||
len = PatLen * 256 * sizeof(uint16_t);
|
||||
w = readFileShort();
|
||||
if (w != len) {
|
||||
printf("Problem with size of T1: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(T1base, 1, len, f) != len) {
|
||||
printf("Could not read T1\n");
|
||||
exit(5);
|
||||
}
|
||||
|
||||
/* Initialise the perfhlib stuff. Also allocates T1, T2, g, etc */
|
||||
hashParams( /* Set the parameters for the hash table */
|
||||
numKeys, /* The number of symbols */
|
||||
PatLen, /* The length of the pattern to be hashed */
|
||||
256, /* The character set of the pattern (0-FF) */
|
||||
0, /* Minimum pattern character value */
|
||||
numVert); /* Specifies C, the sparseness of the graph.
|
||||
See Czech, Havas and Majewski for details
|
||||
*/
|
||||
grab(2);
|
||||
if (memcmp("T2", buf, 2) != 0) {
|
||||
printf("Expected 'T2'\n");
|
||||
exit(3);
|
||||
}
|
||||
w = readFileShort();
|
||||
if (w != len) {
|
||||
printf("Problem with size of T2: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(T2base, 1, len, f) != len) {
|
||||
printf("Could not read T2\n");
|
||||
exit(5);
|
||||
}
|
||||
|
||||
T1base = readT1();
|
||||
T2base = readT2();
|
||||
g = readG();
|
||||
/* Now read the function g[] */
|
||||
grab(2);
|
||||
if (memcmp("gg", buf, 2) != 0) {
|
||||
printf("Expected 'gg'\n");
|
||||
exit(3);
|
||||
}
|
||||
len = numVert * sizeof(uint16_t);
|
||||
w = readFileShort();
|
||||
if (w != len) {
|
||||
printf("Problem with size of g[]: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(g, 1, len, f) != len) {
|
||||
printf("Could not read T2\n");
|
||||
exit(5);
|
||||
}
|
||||
|
||||
/* Read T1 and T2 tables */
|
||||
grab(2);
|
||||
if (memcmp("T1", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'T1'\n");
|
||||
exit(3);
|
||||
}
|
||||
len = PatLen * 256 * sizeof(word);
|
||||
w = readFileShort();
|
||||
if (w != len)
|
||||
{
|
||||
printf("Problem with size of T1: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(T1base, 1, len, f) != len)
|
||||
{
|
||||
printf("Could not read T1\n");
|
||||
exit(5);
|
||||
}
|
||||
|
||||
grab(2);
|
||||
if (memcmp("T2", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'T2'\n");
|
||||
exit(3);
|
||||
}
|
||||
w = readFileShort();
|
||||
if (w != len)
|
||||
{
|
||||
printf("Problem with size of T2: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(T2base, 1, len, f) != len)
|
||||
{
|
||||
printf("Could not read T2\n");
|
||||
exit(5);
|
||||
}
|
||||
|
||||
/* Now read the function g[] */
|
||||
grab(2);
|
||||
if (memcmp("gg", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'gg'\n");
|
||||
exit(3);
|
||||
}
|
||||
len = numVert * sizeof(word);
|
||||
w = readFileShort();
|
||||
if (w != len)
|
||||
{
|
||||
printf("Problem with size of g[]: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(g, 1, len, f) != len)
|
||||
{
|
||||
printf("Could not read T2\n");
|
||||
exit(5);
|
||||
}
|
||||
|
||||
|
||||
/* This is now the hash table */
|
||||
grab(2);
|
||||
if (memcmp("ht", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'ht'\n");
|
||||
exit(3);
|
||||
}
|
||||
w = readFileShort();
|
||||
if (w != numKeys * (SymLen + PatLen + sizeof(word)))
|
||||
{
|
||||
printf("Problem with size of hash table: file %d, calc %d\n", w, len);
|
||||
exit(6);
|
||||
}
|
||||
|
||||
|
||||
for (i=0; i < numKeys; i++)
|
||||
{
|
||||
if (fread(&ht, 1, SymLen + PatLen, f) != (size_t)(SymLen + PatLen))
|
||||
{
|
||||
/* This is now the hash table */
|
||||
grab(2);
|
||||
if (memcmp("ht", buf, 2) != 0) {
|
||||
printf("Expected 'ht'\n");
|
||||
exit(3);
|
||||
}
|
||||
w = readFileShort();
|
||||
if (w != numKeys * (SymLen + PatLen + sizeof(uint16_t))) {
|
||||
printf("Problem with size of hash table: file %d, calc %d\n", w, len);
|
||||
exit(6);
|
||||
}
|
||||
QString argv2(argv[2]);
|
||||
for (i = 0; i < numKeys; i++) {
|
||||
if (fread(&ht, 1, SymLen + PatLen, f) != (size_t)(SymLen + PatLen)) {
|
||||
printf("Could not read pattern %d from %s\n", i, argv[1]);
|
||||
exit(7);
|
||||
}
|
||||
if (stricmp(ht.htSym, argv[2]) == 0)
|
||||
{
|
||||
if (argv2.compare(ht.htSym, Qt::CaseInsensitive) == 0) {
|
||||
/* Found it! */
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
fclose(f);
|
||||
if (i == numKeys)
|
||||
{
|
||||
if (i == numKeys) {
|
||||
printf("Function %s not found!\n", argv[2]);
|
||||
exit(2);
|
||||
}
|
||||
|
||||
printf("Function %s index %d\n", ht.htSym, i);
|
||||
for (i=0; i < PatLen; i++)
|
||||
{
|
||||
for (i = 0; i < PatLen; i++) {
|
||||
printf("%02X ", ht.htPat[i]);
|
||||
}
|
||||
|
||||
@ -193,56 +166,36 @@ main(int argc, char *argv[])
|
||||
fclose(f2);
|
||||
|
||||
printf("\n");
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
cleanup(void)
|
||||
{
|
||||
/* Free the storage for variable sized tables etc */
|
||||
if (T1base) free(T1base);
|
||||
if (T2base) free(T2base);
|
||||
if (g) free(g);
|
||||
void cleanup(void) {
|
||||
/* Free the storage for variable sized tables etc */
|
||||
if (T1base)
|
||||
free(T1base);
|
||||
if (T2base)
|
||||
free(T2base);
|
||||
if (g)
|
||||
free(g);
|
||||
}
|
||||
|
||||
void grab(int n)
|
||||
{
|
||||
if (fread(buf, 1, n, f) != (size_t)n)
|
||||
{
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
void grab(int n) {
|
||||
if (fread(buf, 1, n, f) != (size_t)n) {
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
}
|
||||
|
||||
word
|
||||
readFileShort(void)
|
||||
{
|
||||
byte b1, b2;
|
||||
uint16_t readFileShort(void) {
|
||||
uint8_t b1, b2;
|
||||
|
||||
if (fread(&b1, 1, 1, f) != 1)
|
||||
{
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
if (fread(&b2, 1, 1, f) != 1)
|
||||
{
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
return (b2 << 8) + b1;
|
||||
}
|
||||
|
||||
/* Following two functions not needed unless creating tables */
|
||||
|
||||
void getKey(int i, byte **keys)
|
||||
{
|
||||
}
|
||||
|
||||
/* Display key i */
|
||||
void
|
||||
dispKey(int i)
|
||||
{
|
||||
if (fread(&b1, 1, 1, f) != 1) {
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
if (fread(&b2, 1, 1, f) != 1) {
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
return (b2 << 8) + b1;
|
||||
}
|
||||
|
||||
|
||||
@ -1,287 +1,245 @@
|
||||
/* Quick program to see if a pattern is in a sig file. Pattern is supplied
|
||||
in a small .bin or .com style file */
|
||||
in a small .bin or .com style file */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <memory.h>
|
||||
#include "perfhlib.h"
|
||||
|
||||
/* statics */
|
||||
byte buf[100];
|
||||
int numKeys; /* Number of hash table entries (keys) */
|
||||
int numVert; /* Number of vertices in the graph (also size of g[]) */
|
||||
int PatLen; /* Size of the keys (pattern length) */
|
||||
int SymLen; /* Max size of the symbols, including null */
|
||||
FILE *f; /* Sig file being read */
|
||||
FILE *fpat; /* Pattern file being read */
|
||||
#include <memory.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
static word *T1base, *T2base; /* Pointers to start of T1, T2 */
|
||||
static word *g; /* g[] */
|
||||
/* statics */
|
||||
uint8_t buf[100];
|
||||
int numKeys; /* Number of hash table entries (keys) */
|
||||
int numVert; /* Number of vertices in the graph (also size of g[]) */
|
||||
int PatLen; /* Size of the keys (pattern length) */
|
||||
int SymLen; /* Max size of the symbols, including null */
|
||||
FILE *f; /* Sig file being read */
|
||||
FILE *fpat; /* Pattern file being read */
|
||||
|
||||
static uint16_t *T1base, *T2base; /* Pointers to start of T1, T2 */
|
||||
static uint16_t *g; /* g[] */
|
||||
|
||||
#define SYMLEN 16
|
||||
#define PATLEN 23
|
||||
|
||||
typedef struct HT_tag
|
||||
{
|
||||
/* Hash table structure */
|
||||
char htSym[SYMLEN];
|
||||
byte htPat[PATLEN];
|
||||
typedef struct HT_tag {
|
||||
/* Hash table structure */
|
||||
char htSym[SYMLEN];
|
||||
uint8_t htPat[PATLEN];
|
||||
} HT;
|
||||
|
||||
HT *ht; /* Declare a pointer to a hash table */
|
||||
HT *ht; /* Declare a pointer to a hash table */
|
||||
|
||||
/* prototypes */
|
||||
void grab(int n);
|
||||
word readFileShort(void);
|
||||
uint16_t readFileShort(void);
|
||||
void cleanup(void);
|
||||
void fixWildCards(char *buf); /* In fixwild.c */
|
||||
extern void fixWildCards(uint8_t pat[]); /* In fixwild.c */
|
||||
void pattSearch(void);
|
||||
PerfectHash g_pattern_hasher;
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
uint16_t w, len;
|
||||
int h, i;
|
||||
int patlen;
|
||||
|
||||
void
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
word w, len;
|
||||
int h, i;
|
||||
int patlen;
|
||||
if (argc <= 2) {
|
||||
printf("Usage: srchsig <SigFilename> <PattFilename>\n");
|
||||
printf("Searches the signature file for the given pattern\n");
|
||||
printf("e.g. %s dccm8s.sig mypatt.bin\n", argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (argc <= 2)
|
||||
{
|
||||
printf("Usage: srchsig <SigFilename> <PattFilename>\n");
|
||||
printf("Searches the signature file for the given pattern\n");
|
||||
printf("e.g. %s dccm8s.sig mypatt.bin\n", argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
if ((f = fopen(argv[1], "rb")) == NULL) {
|
||||
printf("Cannot open signature file %s\n", argv[1]);
|
||||
exit(2);
|
||||
}
|
||||
|
||||
if ((f = fopen(argv[1], "rb")) == NULL)
|
||||
{
|
||||
printf("Cannot open signature file %s\n", argv[1]);
|
||||
exit(2);
|
||||
}
|
||||
if ((fpat = fopen(argv[2], "rb")) == NULL) {
|
||||
printf("Cannot open pattern file %s\n", argv[2]);
|
||||
exit(2);
|
||||
}
|
||||
|
||||
if ((fpat = fopen(argv[2], "rb")) == NULL)
|
||||
{
|
||||
printf("Cannot open pattern file %s\n", argv[2]);
|
||||
exit(2);
|
||||
}
|
||||
/* Read the parameters */
|
||||
grab(4);
|
||||
if (memcmp("dccs", buf, 4) != 0) {
|
||||
printf("Not a dccs file!\n");
|
||||
exit(3);
|
||||
}
|
||||
numKeys = readFileShort();
|
||||
numVert = readFileShort();
|
||||
PatLen = readFileShort();
|
||||
SymLen = readFileShort();
|
||||
|
||||
/* Read the parameters */
|
||||
grab(4);
|
||||
if (memcmp("dccs", buf, 4) != 0)
|
||||
{
|
||||
printf("Not a dccs file!\n");
|
||||
exit(3);
|
||||
}
|
||||
numKeys = readFileShort();
|
||||
numVert = readFileShort();
|
||||
PatLen = readFileShort();
|
||||
SymLen = readFileShort();
|
||||
/* Initialise the perfhlib stuff. Also allocates T1, T2, g, etc */
|
||||
g_pattern_hasher.setHashParams(
|
||||
numKeys, /* The number of symbols */
|
||||
PatLen, /* The length of the pattern to be hashed */
|
||||
256, /* The character set of the pattern (0-FF) */
|
||||
0, /* Minimum pattern character value */
|
||||
numVert); /* Specifies C, the sparseness of the graph. See Czech, Havas
|
||||
and Majewski for details */
|
||||
|
||||
/* Initialise the perfhlib stuff. Also allocates T1, T2, g, etc */
|
||||
hashParams( /* Set the parameters for the hash table */
|
||||
numKeys, /* The number of symbols */
|
||||
PatLen, /* The length of the pattern to be hashed */
|
||||
256, /* The character set of the pattern (0-FF) */
|
||||
0, /* Minimum pattern character value */
|
||||
numVert); /* Specifies C, the sparseness of the graph.
|
||||
See Czech, Havas and Majewski for details
|
||||
*/
|
||||
T1base = g_pattern_hasher.readT1();
|
||||
T2base = g_pattern_hasher.readT2();
|
||||
g = g_pattern_hasher.readG();
|
||||
|
||||
T1base = readT1();
|
||||
T2base = readT2();
|
||||
g = readG();
|
||||
/* Read T1 and T2 tables */
|
||||
grab(2);
|
||||
if (memcmp("T1", buf, 2) != 0) {
|
||||
printf("Expected 'T1'\n");
|
||||
exit(3);
|
||||
}
|
||||
len = PatLen * 256 * sizeof(uint16_t);
|
||||
w = readFileShort();
|
||||
if (w != len) {
|
||||
printf("Problem with size of T1: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(T1base, 1, len, f) != len) {
|
||||
printf("Could not read T1\n");
|
||||
exit(5);
|
||||
}
|
||||
|
||||
/* Read T1 and T2 tables */
|
||||
grab(2);
|
||||
if (memcmp("T1", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'T1'\n");
|
||||
exit(3);
|
||||
}
|
||||
len = PatLen * 256 * sizeof(word);
|
||||
w = readFileShort();
|
||||
if (w != len)
|
||||
{
|
||||
printf("Problem with size of T1: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(T1base, 1, len, f) != len)
|
||||
{
|
||||
printf("Could not read T1\n");
|
||||
exit(5);
|
||||
}
|
||||
grab(2);
|
||||
if (memcmp("T2", buf, 2) != 0) {
|
||||
printf("Expected 'T2'\n");
|
||||
exit(3);
|
||||
}
|
||||
w = readFileShort();
|
||||
if (w != len) {
|
||||
printf("Problem with size of T2: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(T2base, 1, len, f) != len) {
|
||||
printf("Could not read T2\n");
|
||||
exit(5);
|
||||
}
|
||||
|
||||
grab(2);
|
||||
if (memcmp("T2", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'T2'\n");
|
||||
exit(3);
|
||||
}
|
||||
w = readFileShort();
|
||||
if (w != len)
|
||||
{
|
||||
printf("Problem with size of T2: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(T2base, 1, len, f) != len)
|
||||
{
|
||||
printf("Could not read T2\n");
|
||||
exit(5);
|
||||
}
|
||||
/* Now read the function g[] */
|
||||
grab(2);
|
||||
if (memcmp("gg", buf, 2) != 0) {
|
||||
printf("Expected 'gg'\n");
|
||||
exit(3);
|
||||
}
|
||||
len = numVert * sizeof(uint16_t);
|
||||
w = readFileShort();
|
||||
if (w != len) {
|
||||
printf("Problem with size of g[]: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(g, 1, len, f) != len) {
|
||||
printf("Could not read T2\n");
|
||||
exit(5);
|
||||
}
|
||||
|
||||
/* Now read the function g[] */
|
||||
grab(2);
|
||||
if (memcmp("gg", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'gg'\n");
|
||||
exit(3);
|
||||
}
|
||||
len = numVert * sizeof(word);
|
||||
w = readFileShort();
|
||||
if (w != len)
|
||||
{
|
||||
printf("Problem with size of g[]: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(g, 1, len, f) != len)
|
||||
{
|
||||
printf("Could not read T2\n");
|
||||
exit(5);
|
||||
}
|
||||
/* This is now the hash table */
|
||||
/* First allocate space for the table */
|
||||
if ((ht = (HT *)malloc(numKeys * sizeof(HT))) == 0) {
|
||||
printf("Could not allocate hash table\n");
|
||||
exit(1);
|
||||
}
|
||||
grab(2);
|
||||
if (memcmp("ht", buf, 2) != 0) {
|
||||
printf("Expected 'ht'\n");
|
||||
exit(3);
|
||||
}
|
||||
w = readFileShort();
|
||||
if (w != numKeys * (SymLen + PatLen + sizeof(uint16_t))) {
|
||||
printf("Problem with size of hash table: file %d, calc %d\n", w, len);
|
||||
exit(6);
|
||||
}
|
||||
|
||||
for (i = 0; i < numKeys; i++) {
|
||||
if ((int)fread(&ht[i], 1, SymLen + PatLen, f) != SymLen + PatLen) {
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
}
|
||||
|
||||
/* This is now the hash table */
|
||||
/* First allocate space for the table */
|
||||
if ((ht = (HT *)malloc(numKeys * sizeof(HT))) == 0)
|
||||
{
|
||||
printf("Could not allocate hash table\n");
|
||||
exit(1);
|
||||
}
|
||||
grab(2);
|
||||
if (memcmp("ht", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'ht'\n");
|
||||
exit(3);
|
||||
}
|
||||
w = readFileShort();
|
||||
if (w != numKeys * (SymLen + PatLen + sizeof(word)))
|
||||
{
|
||||
printf("Problem with size of hash table: file %d, calc %d\n", w, len);
|
||||
exit(6);
|
||||
}
|
||||
|
||||
for (i=0; i < numKeys; i++)
|
||||
{
|
||||
if ((int)fread(&ht[i], 1, SymLen + PatLen, f) != SymLen + PatLen)
|
||||
{
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
}
|
||||
|
||||
/* Read the pattern to buf */
|
||||
if ((patlen = fread(buf, 1, 100, fpat)) == 0)
|
||||
{
|
||||
printf("Could not read pattern\n");
|
||||
exit(11);
|
||||
}
|
||||
if (patlen != PATLEN)
|
||||
{
|
||||
/* Read the pattern to buf */
|
||||
if ((patlen = fread(buf, 1, 100, fpat)) == 0) {
|
||||
printf("Could not read pattern\n");
|
||||
exit(11);
|
||||
}
|
||||
if (patlen != PATLEN) {
|
||||
printf("Error: pattern length is %d, should be %d\n", patlen, PATLEN);
|
||||
exit(12);
|
||||
}
|
||||
|
||||
/* Fix the wildcards */
|
||||
fixWildCards(buf);
|
||||
/* Fix the wildcards */
|
||||
fixWildCards(buf);
|
||||
|
||||
printf("Pattern:\n");
|
||||
for (i=0; i < PATLEN; i++)
|
||||
printf("%02X ", buf[i]);
|
||||
printf("\n");
|
||||
|
||||
|
||||
h = hash(buf);
|
||||
printf("Pattern hashed to %d (0x%X), symbol %s\n", h, h, ht[h].htSym);
|
||||
if (memcmp(ht[h].htPat, buf, PATLEN) == 0)
|
||||
{
|
||||
printf("Pattern matched");
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("Pattern mismatch: found following pattern\n");
|
||||
for (i=0; i < PATLEN; i++)
|
||||
printf("%02X ", ht[h].htPat[i]);
|
||||
printf("\n");
|
||||
pattSearch(); /* Look for it the hard way */
|
||||
}
|
||||
cleanup();
|
||||
free(ht);
|
||||
fclose(f);
|
||||
fclose(fpat);
|
||||
printf("Pattern:\n");
|
||||
for (i = 0; i < PATLEN; i++)
|
||||
printf("%02X ", buf[i]);
|
||||
printf("\n");
|
||||
|
||||
h = g_pattern_hasher.hash(buf);
|
||||
printf("Pattern hashed to %d (0x%X), symbol %s\n", h, h, ht[h].htSym);
|
||||
if (memcmp(ht[h].htPat, buf, PATLEN) == 0) {
|
||||
printf("Pattern matched");
|
||||
} else {
|
||||
printf("Pattern mismatch: found following pattern\n");
|
||||
for (i = 0; i < PATLEN; i++)
|
||||
printf("%02X ", ht[h].htPat[i]);
|
||||
printf("\n");
|
||||
pattSearch(); /* Look for it the hard way */
|
||||
}
|
||||
cleanup();
|
||||
free(ht);
|
||||
fclose(f);
|
||||
fclose(fpat);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void pattSearch(void)
|
||||
{
|
||||
int i;
|
||||
void pattSearch(void) {
|
||||
int i;
|
||||
|
||||
for (i=0; i < numKeys; i++)
|
||||
{
|
||||
if ((i % 100) == 0) printf("\r%d ", i);
|
||||
if (memcmp(ht[i].htPat, buf, PATLEN) == 0)
|
||||
{
|
||||
printf("\nPattern matched offset %d (0x%X)\n", i, i);
|
||||
}
|
||||
}
|
||||
printf("\n");
|
||||
for (i = 0; i < numKeys; i++) {
|
||||
if ((i % 100) == 0)
|
||||
printf("\r%d ", i);
|
||||
if (memcmp(ht[i].htPat, buf, PATLEN) == 0) {
|
||||
printf("\nPattern matched offset %d (0x%X)\n", i, i);
|
||||
}
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
cleanup(void)
|
||||
{
|
||||
/* Free the storage for variable sized tables etc */
|
||||
if (T1base) free(T1base);
|
||||
if (T2base) free(T2base);
|
||||
if (g) free(g);
|
||||
void cleanup(void) {
|
||||
/* Free the storage for variable sized tables etc */
|
||||
if (T1base)
|
||||
free(T1base);
|
||||
if (T2base)
|
||||
free(T2base);
|
||||
if (g)
|
||||
free(g);
|
||||
}
|
||||
|
||||
void grab(int n)
|
||||
{
|
||||
if (fread(buf, 1, n, f) != (size_t)n)
|
||||
{
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
void grab(int n) {
|
||||
if (fread(buf, 1, n, f) != (size_t)n) {
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
}
|
||||
|
||||
word
|
||||
readFileShort(void)
|
||||
{
|
||||
byte b1, b2;
|
||||
uint16_t readFileShort(void) {
|
||||
uint8_t b1, b2;
|
||||
|
||||
if (fread(&b1, 1, 1, f) != 1)
|
||||
{
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
if (fread(&b2, 1, 1, f) != 1)
|
||||
{
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
return (b2 << 8) + b1;
|
||||
if (fread(&b1, 1, 1, f) != 1) {
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
if (fread(&b2, 1, 1, f) != 1) {
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
return (b2 << 8) + b1;
|
||||
}
|
||||
|
||||
/* Following two functions not needed unless creating tables */
|
||||
|
||||
void getKey(int i, byte **keys)
|
||||
{
|
||||
}
|
||||
void getKey(int i, uint8_t **keys) {}
|
||||
|
||||
/* Display key i */
|
||||
void
|
||||
dispKey(int i)
|
||||
{
|
||||
}
|
||||
|
||||
void dispKey(int i) {}
|
||||
|
||||
@ -32,7 +32,7 @@ byte func; /* Function header detected */
|
||||
byte hash_ext;
|
||||
int curly; /* Level inside curly brackets */
|
||||
int xtern; /* Level inside a extern "C" {} situation */
|
||||
int round; /* Level inside () */
|
||||
int round1; /* Level inside () */
|
||||
int line, col;
|
||||
dword chars;
|
||||
char lastch;
|
||||
@ -151,7 +151,7 @@ void phInit(char *filename) // filename is for reference only!!!
|
||||
slosh = last_slosh = start = func = comment = double_slash = hash = ignore1 =
|
||||
quote1 = quote2 = hash_ext = false;
|
||||
|
||||
buff_idx = curly = xtern = col = round = 0;
|
||||
buff_idx = curly = xtern = col = round1 = 0;
|
||||
|
||||
line = 1;
|
||||
|
||||
@ -268,12 +268,12 @@ void phChar(char ch) {
|
||||
if (!IsIgnore()) {
|
||||
char st[80];
|
||||
|
||||
if ((curly == xtern) && (round == 0) && (start)) {
|
||||
if ((curly == xtern) && (round1 == 0) && (start)) {
|
||||
func = true;
|
||||
DBG("[FUNCTION]")
|
||||
}
|
||||
round++;
|
||||
sprintf(st, "[ROUND++ %d]", round);
|
||||
round1++;
|
||||
sprintf(st, "[ROUND++ %d]", round1);
|
||||
DBG(st)
|
||||
}
|
||||
break;
|
||||
@ -282,9 +282,9 @@ void phChar(char ch) {
|
||||
if (!IsIgnore()) {
|
||||
char st[80];
|
||||
|
||||
if (round > 0) {
|
||||
round--;
|
||||
sprintf(st, "[ROUND-- %d]", round);
|
||||
if (round1 > 0) {
|
||||
round1--;
|
||||
sprintf(st, "[ROUND-- %d]", round1);
|
||||
DBG(st)
|
||||
} else {
|
||||
ERR("too many \")\"\n");
|
||||
@ -464,8 +464,8 @@ boolT phPost(void) {
|
||||
err = false;
|
||||
}
|
||||
|
||||
if (round > 0) {
|
||||
sprintf(msg, "EOF: ( level = %d", round);
|
||||
if (round1 > 0) {
|
||||
sprintf(msg, "EOF: ( level = %d", round1);
|
||||
WARN(msg);
|
||||
err = false;
|
||||
}
|
||||
@ -835,7 +835,6 @@ boolT isAttrib(void) {
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
boolT isCdecl(void) {
|
||||
return ((strcmp(token, "__cdecl") == 0) || (strcmp(token, "_Cdecl") == 0) ||
|
||||
(strcmp(token, "cdecl") == 0));
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
add_executable(readsig readsig.cpp)
|
||||
|
||||
target_link_libraries(readsig dcc_hash)
|
||||
qt5_use_modules(readsig Core)
|
||||
@ -1,239 +1,221 @@
|
||||
/* Quick program to read the output from makedsig */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <io.h>
|
||||
#include <stdlib.h>
|
||||
#include <memory.h>
|
||||
#include <string.h>
|
||||
#include "perfhlib.h"
|
||||
|
||||
/* statics */
|
||||
byte buf[100];
|
||||
uint8_t buf[100];
|
||||
int numKeys; /* Number of hash table entries (keys) */
|
||||
int numVert; /* Number of vertices in the graph (also size of g[]) */
|
||||
int PatLen; /* Size of the keys (pattern length) */
|
||||
int SymLen; /* Max size of the symbols, including null */
|
||||
FILE *f; /* File being read */
|
||||
|
||||
static word *T1base, *T2base; /* Pointers to start of T1, T2 */
|
||||
static word *g; /* g[] */
|
||||
|
||||
/* prototypes */
|
||||
void grab(int n);
|
||||
word readFileShort(void);
|
||||
uint16_t readFileShort(void);
|
||||
void cleanup(void);
|
||||
|
||||
static bool bDispAll = FALSE;
|
||||
static bool bDispAll = false;
|
||||
static PerfectHash g_pattern_hasher;
|
||||
static uint16_t *T1base;
|
||||
static uint16_t *T2base;
|
||||
static uint16_t *g;
|
||||
|
||||
void
|
||||
main(int argc, char *argv[])
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
word w, len;
|
||||
int h, i, j;
|
||||
long filePos;
|
||||
uint16_t w, len;
|
||||
int h, i, j;
|
||||
long filePos;
|
||||
|
||||
if (argc <= 1)
|
||||
{
|
||||
printf("Usage: readsig [-a] <SigFilename>\n");
|
||||
printf("-a for all symbols (else just duplicates)\n");
|
||||
exit(1);
|
||||
}
|
||||
if (argc <= 1)
|
||||
{
|
||||
printf("Usage: readsig [-a] <SigFilename>\n");
|
||||
printf("-a for all symbols (else just duplicates)\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
i = 1;
|
||||
i = 1;
|
||||
|
||||
if (strcmp(argv[i], "-a") == 0)
|
||||
{
|
||||
i++;
|
||||
bDispAll = TRUE;
|
||||
}
|
||||
if ((f = fopen(argv[i], "rb")) == NULL)
|
||||
{
|
||||
printf("Cannot open %s\n", argv[i]);
|
||||
exit(2);
|
||||
}
|
||||
if (strcmp(argv[i], "-a") == 0)
|
||||
{
|
||||
i++;
|
||||
bDispAll = true;
|
||||
}
|
||||
if ((f = fopen(argv[i], "rb")) == NULL)
|
||||
{
|
||||
printf("Cannot open %s\n", argv[i]);
|
||||
exit(2);
|
||||
}
|
||||
|
||||
/* Read the parameters */
|
||||
grab(4);
|
||||
if (memcmp("dccs", buf, 4) != 0)
|
||||
{
|
||||
printf("Not a dccs file!\n");
|
||||
exit(3);
|
||||
}
|
||||
numKeys = readFileShort();
|
||||
numVert = readFileShort();
|
||||
PatLen = readFileShort();
|
||||
SymLen = readFileShort();
|
||||
/* Read the parameters */
|
||||
grab(4);
|
||||
if (memcmp("dccs", buf, 4) != 0)
|
||||
{
|
||||
printf("Not a dccs file!\n");
|
||||
exit(3);
|
||||
}
|
||||
numKeys = readFileShort();
|
||||
numVert = readFileShort();
|
||||
PatLen = readFileShort();
|
||||
SymLen = readFileShort();
|
||||
|
||||
/* Initialise the perfhlib stuff. Also allocates T1, T2, g, etc */
|
||||
hashParams( /* Set the parameters for the hash table */
|
||||
numKeys, /* The number of symbols */
|
||||
PatLen, /* The length of the pattern to be hashed */
|
||||
256, /* The character set of the pattern (0-FF) */
|
||||
0, /* Minimum pattern character value */
|
||||
numVert); /* Specifies C, the sparseness of the graph.
|
||||
See Czech, Havas and Majewski for details
|
||||
*/
|
||||
/* Initialise the perfhlib stuff. Also allocates T1, T2, g, etc */
|
||||
g_pattern_hasher.setHashParams(
|
||||
numKeys, /* The number of symbols */
|
||||
PatLen, /* The length of the pattern to be hashed */
|
||||
256, /* The character set of the pattern (0-FF) */
|
||||
0, /* Minimum pattern character value */
|
||||
numVert); /* Specifies C, the sparseness of the graph. See Czech, Havas and Majewski for details */
|
||||
|
||||
T1base = readT1();
|
||||
T2base = readT2();
|
||||
g = readG();
|
||||
T1base = g_pattern_hasher.readT1();
|
||||
T2base = g_pattern_hasher.readT2();
|
||||
g = g_pattern_hasher.readG();
|
||||
|
||||
/* Read T1 and T2 tables */
|
||||
grab(2);
|
||||
if (memcmp("T1", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'T1'\n");
|
||||
exit(3);
|
||||
}
|
||||
len = PatLen * 256 * sizeof(word);
|
||||
w = readFileShort();
|
||||
if (w != len)
|
||||
{
|
||||
printf("Problem with size of T1: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(T1base, 1, len, f) != len)
|
||||
{
|
||||
printf("Could not read T1\n");
|
||||
exit(5);
|
||||
}
|
||||
/* Read T1 and T2 tables */
|
||||
grab(2);
|
||||
if (memcmp("T1", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'T1'\n");
|
||||
exit(3);
|
||||
}
|
||||
len = PatLen * 256 * sizeof(uint16_t);
|
||||
w = readFileShort();
|
||||
if (w != len)
|
||||
{
|
||||
printf("Problem with size of T1: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(T1base, 1, len, f) != len)
|
||||
{
|
||||
printf("Could not read T1\n");
|
||||
exit(5);
|
||||
}
|
||||
|
||||
grab(2);
|
||||
if (memcmp("T2", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'T2'\n");
|
||||
exit(3);
|
||||
}
|
||||
w = readFileShort();
|
||||
if (w != len)
|
||||
{
|
||||
printf("Problem with size of T2: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(T2base, 1, len, f) != len)
|
||||
{
|
||||
printf("Could not read T2\n");
|
||||
exit(5);
|
||||
}
|
||||
grab(2);
|
||||
if (memcmp("T2", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'T2'\n");
|
||||
exit(3);
|
||||
}
|
||||
w = readFileShort();
|
||||
if (w != len)
|
||||
{
|
||||
printf("Problem with size of T2: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(T2base, 1, len, f) != len)
|
||||
{
|
||||
printf("Could not read T2\n");
|
||||
exit(5);
|
||||
}
|
||||
|
||||
/* Now read the function g[] */
|
||||
grab(2);
|
||||
if (memcmp("gg", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'gg'\n");
|
||||
exit(3);
|
||||
}
|
||||
len = numVert * sizeof(word);
|
||||
w = readFileShort();
|
||||
if (w != len)
|
||||
{
|
||||
printf("Problem with size of g[]: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(g, 1, len, f) != len)
|
||||
{
|
||||
printf("Could not read T2\n");
|
||||
exit(5);
|
||||
}
|
||||
/* Now read the function g[] */
|
||||
grab(2);
|
||||
if (memcmp("gg", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'gg'\n");
|
||||
exit(3);
|
||||
}
|
||||
len = numVert * sizeof(uint16_t);
|
||||
w = readFileShort();
|
||||
if (w != len)
|
||||
{
|
||||
printf("Problem with size of g[]: file %d, calc %d\n", w, len);
|
||||
exit(4);
|
||||
}
|
||||
if (fread(g, 1, len, f) != len)
|
||||
{
|
||||
printf("Could not read T2\n");
|
||||
exit(5);
|
||||
}
|
||||
|
||||
|
||||
/* This is now the hash table */
|
||||
grab(2);
|
||||
if (memcmp("ht", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'ht'\n");
|
||||
exit(3);
|
||||
}
|
||||
w = readFileShort();
|
||||
if (w != numKeys * (SymLen + PatLen + sizeof(word)))
|
||||
{
|
||||
printf("Problem with size of hash table: file %d, calc %d\n", w, len);
|
||||
exit(6);
|
||||
}
|
||||
/* This is now the hash table */
|
||||
grab(2);
|
||||
if (memcmp("ht", buf, 2) != 0)
|
||||
{
|
||||
printf("Expected 'ht'\n");
|
||||
exit(3);
|
||||
}
|
||||
w = readFileShort();
|
||||
if (w != numKeys * (SymLen + PatLen + sizeof(uint16_t)))
|
||||
{
|
||||
printf("Problem with size of hash table: file %d, calc %d\n", w, len);
|
||||
exit(6);
|
||||
}
|
||||
|
||||
if (bDispAll)
|
||||
{
|
||||
fseek(f, 0, SEEK_CUR); /* Needed due to bug in MS fread()! */
|
||||
filePos = _lseek(fileno(f), 0, SEEK_CUR);
|
||||
for (i=0; i < numKeys; i++)
|
||||
{
|
||||
grab(SymLen + PatLen);
|
||||
if (bDispAll)
|
||||
{
|
||||
filePos = ftell(f);
|
||||
for (i=0; i < numKeys; i++)
|
||||
{
|
||||
grab(SymLen + PatLen);
|
||||
|
||||
printf("%16s ", buf);
|
||||
for (j=0; j < PatLen; j++)
|
||||
{
|
||||
printf("%02X", buf[SymLen+j]);
|
||||
if ((j%4) == 3) printf(" ");
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
printf("\n\n\n");
|
||||
fseek(f, filePos, SEEK_SET);
|
||||
}
|
||||
printf("%16s ", buf);
|
||||
for (j=0; j < PatLen; j++)
|
||||
{
|
||||
printf("%02X", buf[SymLen+j]);
|
||||
if ((j%4) == 3) printf(" ");
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
printf("\n\n\n");
|
||||
fseek(f, filePos, SEEK_SET);
|
||||
}
|
||||
|
||||
for (i=0; i < numKeys; i++)
|
||||
{
|
||||
grab(SymLen + PatLen);
|
||||
for (i=0; i < numKeys; i++)
|
||||
{
|
||||
grab(SymLen + PatLen);
|
||||
|
||||
h = hash(&buf[SymLen]);
|
||||
if (h != i)
|
||||
{
|
||||
printf("Symbol %16s (index %3d) hashed to %d\n",
|
||||
buf, i, h);
|
||||
}
|
||||
}
|
||||
|
||||
printf("Done!\n");
|
||||
fclose(f);
|
||||
h = g_pattern_hasher.hash(&buf[SymLen]);
|
||||
if (h != i)
|
||||
{
|
||||
printf("Symbol %16s (index %3d) hashed to %d\n", buf, i, h);
|
||||
}
|
||||
}
|
||||
|
||||
printf("Done!\n");
|
||||
fclose(f);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
cleanup(void)
|
||||
{
|
||||
/* Free the storage for variable sized tables etc */
|
||||
if (T1base) free(T1base);
|
||||
if (T2base) free(T2base);
|
||||
if (g) free(g);
|
||||
// TODO: g_pattern_hasher.hashCleanup();
|
||||
/* Free the storage for variable sized tables etc */
|
||||
if (T1base) free(T1base);
|
||||
if (T2base) free(T2base);
|
||||
if (g) free(g);
|
||||
}
|
||||
|
||||
void grab(int n)
|
||||
{
|
||||
if (fread(buf, 1, n, f) != (size_t)n)
|
||||
{
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
if (fread(buf, 1, n, f) != (size_t)n)
|
||||
{
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
}
|
||||
|
||||
word
|
||||
readFileShort(void)
|
||||
uint16_t readFileShort(void)
|
||||
{
|
||||
byte b1, b2;
|
||||
uint8_t b1, b2;
|
||||
|
||||
if (fread(&b1, 1, 1, f) != 1)
|
||||
{
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
if (fread(&b2, 1, 1, f) != 1)
|
||||
{
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
return (b2 << 8) + b1;
|
||||
if (fread(&b1, 1, 1, f) != 1)
|
||||
{
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
if (fread(&b2, 1, 1, f) != 1)
|
||||
{
|
||||
printf("Could not read\n");
|
||||
exit(11);
|
||||
}
|
||||
return (b2 << 8) + b1;
|
||||
}
|
||||
|
||||
/* Following two functions not needed unless creating tables */
|
||||
|
||||
void getKey(int i, byte **keys)
|
||||
{
|
||||
}
|
||||
|
||||
/* Display key i */
|
||||
void
|
||||
dispKey(int i)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user