luckyimnotanigger/mkp224o
1
0
Fork 0
mirror of https://github.com/cathugger/mkp224o.git synced 2025-05-14 14:02:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip fixes

Browse source
This commit is contained in:
cathugger 2017-10-09 15:58:35 +00:00
parent e89514aef2
commit b2138b6b65
1 changed files with 56 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

79
main.c
View file

@ -78,12 +78,18 @@ struct binfilter {
#define IFT u64 #define IFT u64
#endif #endif
struct intfilter { struct intfilter {
IFT f,m; IFT f;
#ifndef BINSEARCH
IFT m;
#endif
} ; } ;
VEC_STRUCT(ifiltervec,struct intfilter) ifilters; VEC_STRUCT(ifiltervec,struct intfilter) ifilters;
#else #ifdef BINSEARCH
IFT ifiltermask;
#endif // BINSEARCH
#else // INTFILTER
VEC_STRUCT(bfiltervec,struct binfilter) bfilters; VEC_STRUCT(bfiltervec,struct binfilter) bfilters;
#endif #endif // INTFILTER
static void filters_init() static void filters_init()
{ {
@ -98,6 +104,7 @@ static void filters_init()
// o - old filter, n - new // o - old filter, n - new
// return -1 - old stays, 0 - no conflict, 1 - new overrides old // return -1 - old stays, 0 - no conflict, 1 - new overrides old
// assumes masked bits are cleared already // assumes masked bits are cleared already
#ifndef BINSEARCH
static inline int ifilter_conflict(struct intfilter *o,struct intfilter *n) static inline int ifilter_conflict(struct intfilter *o,struct intfilter *n)
{ {
if ((o->f & n->m) != (n->f & o->m)) if ((o->f & n->m) != (n->f & o->m))
@ -107,7 +114,17 @@ static inline int ifilter_conflict(struct intfilter *o,struct intfilter *n)
return -1; return -1;
return 1; return 1;
} }
#else #else // BINSEARCH
static inline int ifilter_conflict(struct intfilter *o,struct intfilter *n,IFT mask)
{
if ((o->f & mask) != (n->f & ifiltermask))
return 0;
if (ifiltermask <= mask)
return -1;
return 1;
}
#endif // BINSEARCH
#else // INTFILTER
// o - old filter, n - new // o - old filter, n - new
// return: -1 - old stays, 0 - no conflict, 1 - new overrides old // return: -1 - old stays, 0 - no conflict, 1 - new overrides old
// assumes irrelevant bits are cleared already // assumes irrelevant bits are cleared already
@ -187,16 +204,17 @@ static inline int bfilter_conflict(struct binfilter *o,struct binfilter *n)
* or.. * or..
* realmask <- (val & 0x000000dd) | ((val << relshiftval) & 0x0sss0000) * realmask <- (val & 0x000000dd) | ((val << relshiftval) & 0x0sss0000)
*/ */
static inline void ifilter_addflatten(struct intfilter *ifltr) static inline void ifilter_addflatten(struct intfilter *ifltr,IFT mask)
{ {
printf(">enter flatten,f:%08X,m:%08X\n",ifltr->f,ifltr->m); printf(">enter flatten,f:%08X,m:%08X\n",ifltr->f,mask);
if (VEC_LENGTH(ifilters) == 0) { if (VEC_LENGTH(ifilters) == 0) {
printf(">flatten simple\n"); printf(">flatten simple\n");
// simple // simple
VEC_ADD(ifilters,*ifltr); VEC_ADD(ifilters,*ifltr);
ifiltermask = mask;
return; return;
} }
if (VEC_BUF(ifilters,0).m == ifltr->m) { if (ifiltermask == mask) {
printf(">flatten lucky\n"); printf(">flatten lucky\n");
// lucky, only need to insert at the right place // lucky, only need to insert at the right place
VEC_FOR(ifilters,i) { VEC_FOR(ifilters,i) {
@ -208,8 +226,8 @@ static inline void ifilter_addflatten(struct intfilter *ifltr)
VEC_ADD(ifilters,*ifltr); VEC_ADD(ifilters,*ifltr);
return; return;
} }
printf(">flatten complicated; em:0x%08X,m:0x%08X\n",VEC_BUF(ifilters,0).m,ifltr->m); printf(">flatten complicated; em:0x%08X,m:0x%08X\n",ifiltermask,mask);
IFT cross = VEC_BUF(ifilters,0).m ^ ifltr->m; IFT cross = ifiltermask ^ mask;
printf(">cross:%08X\n",cross); printf(">cross:%08X\n",cross);
int ishift = 0; int ishift = 0;
while ((cross & 1) == 0) { while ((cross & 1) == 0) {
@ -222,14 +240,12 @@ static inline void ifilter_addflatten(struct intfilter *ifltr)
IFT dmask = cross ^ smask; // direct mask IFT dmask = cross ^ smask; // direct mask
printf(">dmask:%08X\n",dmask); printf(">dmask:%08X\n",dmask);
IFT cmask; // combined mask IFT cmask; // combined mask
int rshift = -1; // relative shift int rshift = 0; // relative shift
do { while (cmask = (smask >> rshift) | dmask,(cmask & (cmask + 1)) != 0)
++rshift; ++rshift;
cmask = (smask >> rshift) | dmask;
} while ((cmask & (cmask + 1)) != 0);
printf(">cmask:%08X,rshift:%d\n",cmask,rshift); printf(">cmask:%08X,rshift:%d\n",cmask,rshift);
// preparations done // preparations done
if (VEC_BUF(ifilters,0).m > ifltr->m) { if (ifiltermask > mask) {
// already existing stuff has more precise mask than we // already existing stuff has more precise mask than we
// so we need to flatten our stuff // so we need to flatten our stuff
// first find where we should insert // first find where we should insert
@ -239,13 +255,11 @@ static inline void ifilter_addflatten(struct intfilter *ifltr)
printf(">before insert:%d\n",(int)VEC_LENGTH(ifilters)); printf(">before insert:%d\n",(int)VEC_LENGTH(ifilters));
VEC_INSERTN(ifilters,i,cmask + 1); VEC_INSERTN(ifilters,i,cmask + 1);
printf(">after insert:%d\n",(int)VEC_LENGTH(ifilters)); printf(">after insert:%d\n",(int)VEC_LENGTH(ifilters));
printf(">afterval f:%08X,m:%08X\n",VEC_BUF(ifilters,i+cmask+1).f,VEC_BUF(ifilters,i+cmask+1).m); printf(">afterval f:%08X\n",VEC_BUF(ifilters,i+cmask+1).f);
for (size_t j = 0;;++j) { for (size_t j = 0;;++j) {
VEC_BUF(ifilters,i + j).f = ifltr->f | (((j & dmask) | ((j << rshift) & smask)) << ishift); VEC_BUF(ifilters,i + j).f = ifltr->f | (((j & dmask) | ((j << rshift) & smask)) << ishift);
VEC_BUF(ifilters,i + j).m = VEC_BUF(ifilters,0).m; printf(">insert pos:%d,f:%08X\n",
printf(">insert pos:%d,f:%08X,m:%08X\n", (int)(i + j),VEC_BUF(ifilters,i + j).f);
(int)(i + j),VEC_BUF(ifilters,i + j).f,
VEC_BUF(ifilters,i + j).m);
if (j == cmask) if (j == cmask)
break; break;
} }
@ -305,9 +319,19 @@ static void filters_add(const char *filter)
mc.b[bf.len] = bf.mask; mc.b[bf.len] = bf.mask;
memcpy(fc.b,bf.f,sizeof(fc.b)); memcpy(fc.b,bf.f,sizeof(fc.b));
fc.i &= mc.i; fc.i &= mc.i;
struct intfilter ifltr = {.f = fc.i,.m = mc.i}; struct intfilter ifltr = {
.f = fc.i,
#ifndef BINSEARCH
.m = mc.i,
#endif
};
VEC_FOR(ifilters,i) { VEC_FOR(ifilters,i) {
int c = ifilter_conflict(&VEC_BUF(ifilters,i),&ifltr); int c;
#ifndef BINSEARCH
c = ifilter_conflict(&VEC_BUF(ifilters,i),&ifltr);
#else
c = ifilter_conflict(&VEC_BUF(ifilters,i),&ifltr,mc.i);
#endif
if (c < 0) if (c < 0)
return; // old filter eats us return; // old filter eats us
else if (c > 0) { else if (c > 0) {
@ -317,7 +341,7 @@ static void filters_add(const char *filter)
} }
} }
#ifdef BINSEARCH #ifdef BINSEARCH
ifilter_addflatten(&ifltr); ifilter_addflatten(&ifltr,mc.i);
#else #else
VEC_FOR(ifilters,i) { VEC_FOR(ifilters,i) {
// filter with least bits first // filter with least bits first
@ -378,7 +402,11 @@ static size_t filters_count()
#ifdef INTFILTER #ifdef INTFILTER
#define FILTERFOR(it) for (it = 0;it < VEC_LENGTH(ifilters);++it) #define FILTERFOR(it) for (it = 0;it < VEC_LENGTH(ifilters);++it)
#ifndef BINSEARCH
#define MATCHFILTER(it,pk) ((*(IFT *)(pk) & VEC_BUF(ifilters,it).m) == VEC_BUF(ifilters,it).f) #define MATCHFILTER(it,pk) ((*(IFT *)(pk) & VEC_BUF(ifilters,it).m) == VEC_BUF(ifilters,it).f)
#else
#define MATCHFILTER(it,pk) ((*(IFT *)(pk) & ifiltermask) == VEC_BUF(ifilters,it).f)
#endif
#else #else
@ -423,7 +451,12 @@ static void printfilters()
u8 bufx[128]; u8 bufx[128];
#ifdef INTFILTER #ifdef INTFILTER
size_t len = 0; size_t len = 0;
u8 *imraw = (u8 *)&VEC_BUF(ifilters,i).m; u8 *imraw;
#ifndef BINSEARCH
imraw = (u8 *)&VEC_BUF(ifilters,i).m;
#else
imraw = (u8 *)&ifiltermask;
#endif
while (len < sizeof(IFT) && imraw[len] != 0x00) ++len; while (len < sizeof(IFT) && imraw[len] != 0x00) ++len;
u8 mask = imraw[len-1]; u8 mask = imraw[len-1];
u8 *ifraw = (u8 *)&VEC_BUF(ifilters,i).f; u8 *ifraw = (u8 *)&VEC_BUF(ifilters,i).f;