diff -uNrp judy-1.0.5-orig/src/Judy1/Judy1.h judy-1.0.5/src/Judy1/Judy1.h --- judy-1.0.5-orig/src/Judy1/Judy1.h 2005-02-16 07:36:07.000000000 +1030 +++ judy-1.0.5/src/Judy1/Judy1.h 2016-08-03 11:10:59.753058600 +0930 @@ -438,7 +438,7 @@ typedef struct J_UDY1_POPULATION_AND_MEM } j1pm_t, *Pj1pm_t; -// TABLES FOR DETERMINING IF LEAVES HAVE ROOM TO GROW: +// ACCESSORS TABLES FOR DETERMINING IF LEAVES HAVE ROOM TO GROW: // // These tables indicate if a given memory chunk can support growth of a given // object into wasted (rounded-up) memory in the chunk. This violates the @@ -447,53 +447,53 @@ typedef struct J_UDY1_POPULATION_AND_MEM // Also define macros to hide the details in the code using these tables. #ifndef JU_64BIT -extern const uint8_t j__1_Leaf1PopToWords[cJ1_LEAF1_MAXPOP1 + 1]; +uint8_t j__1_Leaf1GetPopToWords(unsigned int i); #endif -extern const uint8_t j__1_Leaf2PopToWords[cJ1_LEAF2_MAXPOP1 + 1]; -extern const uint8_t j__1_Leaf3PopToWords[cJ1_LEAF3_MAXPOP1 + 1]; +uint8_t j__1_Leaf2GetPopToWords(unsigned int i); +uint8_t j__1_Leaf3GetPopToWords(unsigned int i); #ifdef JU_64BIT -extern const uint8_t j__1_Leaf4PopToWords[cJ1_LEAF4_MAXPOP1 + 1]; -extern const uint8_t j__1_Leaf5PopToWords[cJ1_LEAF5_MAXPOP1 + 1]; -extern const uint8_t j__1_Leaf6PopToWords[cJ1_LEAF6_MAXPOP1 + 1]; -extern const uint8_t j__1_Leaf7PopToWords[cJ1_LEAF7_MAXPOP1 + 1]; +uint8_t j__1_Leaf4GetPopToWords(unsigned int i); +uint8_t j__1_Leaf5GetPopToWords(unsigned int i); +uint8_t j__1_Leaf6GetPopToWords(unsigned int i); +uint8_t j__1_Leaf7GetPopToWords(unsigned int i); #endif -extern const uint8_t j__1_LeafWPopToWords[cJ1_LEAFW_MAXPOP1 + 1]; +uint8_t j__1_LeafWGetPopToWords(unsigned int i); // Check if increase of population will fit in same leaf: #ifndef JU_64BIT #define J1_LEAF1GROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJ1_LEAF1_MAXPOP1, j__1_Leaf1PopToWords) + J__U_GROWCK(Pop1, cJ1_LEAF1_MAXPOP1, j__1_Leaf1GetPopToWords) #endif #define J1_LEAF2GROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJ1_LEAF2_MAXPOP1, j__1_Leaf2PopToWords) + J__U_GROWCK(Pop1, cJ1_LEAF2_MAXPOP1, j__1_Leaf2GetPopToWords) #define J1_LEAF3GROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJ1_LEAF3_MAXPOP1, j__1_Leaf3PopToWords) + J__U_GROWCK(Pop1, cJ1_LEAF3_MAXPOP1, j__1_Leaf3GetPopToWords) #ifdef JU_64BIT #define J1_LEAF4GROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJ1_LEAF4_MAXPOP1, j__1_Leaf4PopToWords) + J__U_GROWCK(Pop1, cJ1_LEAF4_MAXPOP1, j__1_Leaf4GetPopToWords) #define J1_LEAF5GROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJ1_LEAF5_MAXPOP1, j__1_Leaf5PopToWords) + J__U_GROWCK(Pop1, cJ1_LEAF5_MAXPOP1, j__1_Leaf5GetPopToWords) #define J1_LEAF6GROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJ1_LEAF6_MAXPOP1, j__1_Leaf6PopToWords) + J__U_GROWCK(Pop1, cJ1_LEAF6_MAXPOP1, j__1_Leaf6GetPopToWords) #define J1_LEAF7GROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJ1_LEAF7_MAXPOP1, j__1_Leaf7PopToWords) + J__U_GROWCK(Pop1, cJ1_LEAF7_MAXPOP1, j__1_Leaf7GetPopToWords) #endif #define J1_LEAFWGROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJ1_LEAFW_MAXPOP1, j__1_LeafWPopToWords) + J__U_GROWCK(Pop1, cJ1_LEAFW_MAXPOP1, j__1_LeafWGetPopToWords) #ifndef JU_64BIT -#define J1_LEAF1POPTOWORDS(Pop1) (j__1_Leaf1PopToWords[Pop1]) +#define J1_LEAF1POPTOWORDS(Pop1) (j__1_Leaf1GetPopToWords(Pop1)) #endif -#define J1_LEAF2POPTOWORDS(Pop1) (j__1_Leaf2PopToWords[Pop1]) -#define J1_LEAF3POPTOWORDS(Pop1) (j__1_Leaf3PopToWords[Pop1]) +#define J1_LEAF2POPTOWORDS(Pop1) (j__1_Leaf2GetPopToWords(Pop1)) +#define J1_LEAF3POPTOWORDS(Pop1) (j__1_Leaf3GetPopToWords(Pop1)) #ifdef JU_64BIT -#define J1_LEAF4POPTOWORDS(Pop1) (j__1_Leaf4PopToWords[Pop1]) -#define J1_LEAF5POPTOWORDS(Pop1) (j__1_Leaf5PopToWords[Pop1]) -#define J1_LEAF6POPTOWORDS(Pop1) (j__1_Leaf6PopToWords[Pop1]) -#define J1_LEAF7POPTOWORDS(Pop1) (j__1_Leaf7PopToWords[Pop1]) +#define J1_LEAF4POPTOWORDS(Pop1) (j__1_Leaf4GetPopToWords(Pop1)) +#define J1_LEAF5POPTOWORDS(Pop1) (j__1_Leaf5GetPopToWords(Pop1)) +#define J1_LEAF6POPTOWORDS(Pop1) (j__1_Leaf6GetPopToWords(Pop1)) +#define J1_LEAF7POPTOWORDS(Pop1) (j__1_Leaf7GetPopToWords(Pop1)) #endif -#define J1_LEAFWPOPTOWORDS(Pop1) (j__1_LeafWPopToWords[Pop1]) +#define J1_LEAFWPOPTOWORDS(Pop1) (j__1_LeafWGetPopToWords(Pop1)) // FUNCTIONS TO ALLOCATE OBJECTS: diff -uNrp judy-1.0.5-orig/src/JudyCommon/JudyPrivate1L.h judy-1.0.5/src/JudyCommon/JudyPrivate1L.h --- judy-1.0.5-orig/src/JudyCommon/JudyPrivate1L.h 2005-02-16 07:36:07.000000000 +1030 +++ judy-1.0.5/src/JudyCommon/JudyPrivate1L.h 2016-08-03 11:10:59.753058600 +0930 @@ -68,7 +68,7 @@ #define cJU_JPBRANCH_L7 cJ1_JPBRANCH_L7 #endif #define cJU_JPBRANCH_L cJ1_JPBRANCH_L -#define j__U_BranchBJPPopToWords j__1_BranchBJPPopToWords +#define j__U_BranchBJPGetPopToWords j__1_BranchBJPGetPopToWords #define cJU_JPBRANCH_B2 cJ1_JPBRANCH_B2 #define cJU_JPBRANCH_B3 cJ1_JPBRANCH_B3 #ifdef JU_64BIT @@ -169,7 +169,7 @@ #define cJU_JPBRANCH_L7 cJL_JPBRANCH_L7 #endif #define cJU_JPBRANCH_L cJL_JPBRANCH_L -#define j__U_BranchBJPPopToWords j__L_BranchBJPPopToWords +#define j__U_BranchBJPGetPopToWords j__L_BranchBJPGetPopToWords #define cJU_JPBRANCH_B2 cJL_JPBRANCH_B2 #define cJU_JPBRANCH_B3 cJL_JPBRANCH_B3 #ifdef JU_64BIT diff -uNrp judy-1.0.5-orig/src/JudyCommon/JudyPrivateBranch.h judy-1.0.5/src/JudyCommon/JudyPrivateBranch.h --- judy-1.0.5-orig/src/JudyCommon/JudyPrivateBranch.h 2005-02-16 07:36:07.000000000 +1030 +++ judy-1.0.5/src/JudyCommon/JudyPrivateBranch.h 2016-08-03 11:11:52.852561057 +0930 @@ -151,10 +151,10 @@ typedef union J_UDY_POINTER // same space. #define J__U_GROWCK(POP1,MAXPOP1,POPTOWORDS) \ - (((POP1) != (MAXPOP1)) && (POPTOWORDS[POP1] == POPTOWORDS[(POP1) + 1])) + (((POP1) != (MAXPOP1)) && (POPTOWORDS(POP1) == POPTOWORDS((POP1) + 1))) #define JU_BRANCHBJPGROWINPLACE(NumJPs) \ - J__U_GROWCK(NumJPs, cJU_BITSPERSUBEXPB, j__U_BranchBJPPopToWords) + J__U_GROWCK(NumJPs, cJU_BITSPERSUBEXPB, j__U_BranchBJPGetPopToWords) // DETERMINE IF AN INDEX IS (NOT) IN A JPS EXPANSE: @@ -269,7 +269,7 @@ typedef struct J__UDY_BRANCH_BITMAP #endif } jbb_t, * Pjbb_t; -#define JU_BRANCHJP_NUMJPSTOWORDS(NumJPs) (j__U_BranchBJPPopToWords[NumJPs]) +#define JU_BRANCHJP_NUMJPSTOWORDS(NumJPs) (j__U_BranchBJPGetPopToWords(NumJPs)) #ifdef SUBEXPCOUNTS #define cJU_NUMSUBEXPU 16 // number of subexpanse counts. diff -uNrp judy-1.0.5-orig/src/JudyCommon/JudyPrivate.h judy-1.0.5/src/JudyCommon/JudyPrivate.h --- judy-1.0.5-orig/src/JudyCommon/JudyPrivate.h 2005-02-16 07:36:07.000000000 +1030 +++ judy-1.0.5/src/JudyCommon/JudyPrivate.h 2016-08-03 11:10:59.753058600 +0930 @@ -483,11 +483,11 @@ typedef PWord_t Pjv_t; // pointer to J // EXPORTED DATA AND FUNCTIONS: #ifdef JUDY1 -extern const uint8_t j__1_BranchBJPPopToWords[]; +uint8_t j__1_BranchBJPGetPopToWords(unsigned int i); #endif #ifdef JUDYL -extern const uint8_t j__L_BranchBJPPopToWords[]; +uint8_t j__L_BranchBJPGetPopToWords(unsigned int i); #endif // Fast LeafL search routine used for inlined code: diff -uNrp judy-1.0.5-orig/src/JudyCommon/JudyTables.c judy-1.0.5/src/JudyCommon/JudyTables.c --- judy-1.0.5-orig/src/JudyCommon/JudyTables.c 2005-02-16 07:36:07.000000000 +1030 +++ judy-1.0.5/src/JudyCommon/JudyTables.c 2016-08-03 11:10:59.753058600 +0930 @@ -139,7 +139,7 @@ FUNCTION void GenTable( fprintf(fd,"\n//\tobject uses %d words\n", CurWord); fprintf(fd,"//\t%s = %d\n", TableSize, LeafSize); - fprintf(fd,"const uint8_t\n"); + fprintf(fd,"static const uint8_t\n"); fprintf(fd,"%sPopToWords[%s + 1] =\n", TableName, TableSize); fprintf(fd,"{\n\t 0,"); @@ -157,12 +157,14 @@ FUNCTION void GenTable( if (ii != LeafSize) fprintf(fd,", "); } fprintf(fd,"\n};\n"); + fprintf(fd,"uint8_t\n"); + fprintf(fd,"%sGetPopToWords(unsigned int i) { return %sPopToWords[i]; }\n", TableName, TableName); // Print the Offset table if needed: if (! ValueBytes) return; - fprintf(fd,"const uint8_t\n"); + fprintf(fd,"static const uint8_t\n"); fprintf(fd,"%sOffset[%s + 1] =\n", TableName, TableSize); fprintf(fd,"{\n"); fprintf(fd,"\t 0,"); @@ -176,6 +178,8 @@ FUNCTION void GenTable( if (ii != LeafSize) fprintf(fd,", "); } fprintf(fd,"\n};\n"); + fprintf(fd,"uint8_t\n"); + fprintf(fd,"%sGetOffset(unsigned int i) { return %sOffset[i]; }\n", TableName, TableName); } // GenTable() diff -uNrp judy-1.0.5-orig/src/JudyL/JudyL.h judy-1.0.5/src/JudyL/JudyL.h --- judy-1.0.5-orig/src/JudyL/JudyL.h 2005-02-16 07:36:07.000000000 +1030 +++ judy-1.0.5/src/JudyL/JudyL.h 2016-08-03 11:10:59.753058600 +0930 @@ -380,76 +380,76 @@ typedef struct J_UDYL_POPULATION_AND_MEM // object into wasted (rounded-up) memory in the chunk. Note: This violates // the hiddenness of the JudyMalloc code. -extern const uint8_t j__L_Leaf1PopToWords[cJL_LEAF1_MAXPOP1 + 1]; -extern const uint8_t j__L_Leaf2PopToWords[cJL_LEAF2_MAXPOP1 + 1]; -extern const uint8_t j__L_Leaf3PopToWords[cJL_LEAF3_MAXPOP1 + 1]; +uint8_t j__L_Leaf1GetPopToWords(unsigned int i); +uint8_t j__L_Leaf2GetPopToWords(unsigned int i); +uint8_t j__L_Leaf3GetPopToWords(unsigned int i); #ifdef JU_64BIT -extern const uint8_t j__L_Leaf4PopToWords[cJL_LEAF4_MAXPOP1 + 1]; -extern const uint8_t j__L_Leaf5PopToWords[cJL_LEAF5_MAXPOP1 + 1]; -extern const uint8_t j__L_Leaf6PopToWords[cJL_LEAF6_MAXPOP1 + 1]; -extern const uint8_t j__L_Leaf7PopToWords[cJL_LEAF7_MAXPOP1 + 1]; +uint8_t j__L_Leaf4GetPopToWords(unsigned int i); +uint8_t j__L_Leaf5GetPopToWords(unsigned int i); +uint8_t j__L_Leaf6GetPopToWords(unsigned int i); +uint8_t j__L_Leaf7GetPopToWords(unsigned int i); #endif -extern const uint8_t j__L_LeafWPopToWords[cJL_LEAFW_MAXPOP1 + 1]; -extern const uint8_t j__L_LeafVPopToWords[]; +uint8_t j__L_LeafWGetPopToWords(unsigned int i); +uint8_t j__L_LeafVGetPopToWords(unsigned int i); // These tables indicate where value areas start: -extern const uint8_t j__L_Leaf1Offset [cJL_LEAF1_MAXPOP1 + 1]; -extern const uint8_t j__L_Leaf2Offset [cJL_LEAF2_MAXPOP1 + 1]; -extern const uint8_t j__L_Leaf3Offset [cJL_LEAF3_MAXPOP1 + 1]; +uint8_t j__L_Leaf1GetOffset (unsigned int i); +uint8_t j__L_Leaf2GetOffset (unsigned int i); +uint8_t j__L_Leaf3GetOffset (unsigned int i); #ifdef JU_64BIT -extern const uint8_t j__L_Leaf4Offset [cJL_LEAF4_MAXPOP1 + 1]; -extern const uint8_t j__L_Leaf5Offset [cJL_LEAF5_MAXPOP1 + 1]; -extern const uint8_t j__L_Leaf6Offset [cJL_LEAF6_MAXPOP1 + 1]; -extern const uint8_t j__L_Leaf7Offset [cJL_LEAF7_MAXPOP1 + 1]; +uint8_t j__L_Leaf4GetOffset (unsigned int i); +uint8_t j__L_Leaf5GetOffset (unsigned int i); +uint8_t j__L_Leaf6GetOffset (unsigned int i); +uint8_t j__L_Leaf7GetOffset (unsigned int i); #endif -extern const uint8_t j__L_LeafWOffset [cJL_LEAFW_MAXPOP1 + 1]; +uint8_t j__L_LeafWGetOffset (unsigned int i); // Also define macros to hide the details in the code using these tables. #define JL_LEAF1GROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJL_LEAF1_MAXPOP1, j__L_Leaf1PopToWords) + J__U_GROWCK(Pop1, cJL_LEAF1_MAXPOP1, j__L_Leaf1GetPopToWords) #define JL_LEAF2GROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJL_LEAF2_MAXPOP1, j__L_Leaf2PopToWords) + J__U_GROWCK(Pop1, cJL_LEAF2_MAXPOP1, j__L_Leaf2GetPopToWords) #define JL_LEAF3GROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJL_LEAF3_MAXPOP1, j__L_Leaf3PopToWords) + J__U_GROWCK(Pop1, cJL_LEAF3_MAXPOP1, j__L_Leaf3GetPopToWords) #ifdef JU_64BIT #define JL_LEAF4GROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJL_LEAF4_MAXPOP1, j__L_Leaf4PopToWords) + J__U_GROWCK(Pop1, cJL_LEAF4_MAXPOP1, j__L_Leaf4GetPopToWords) #define JL_LEAF5GROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJL_LEAF5_MAXPOP1, j__L_Leaf5PopToWords) + J__U_GROWCK(Pop1, cJL_LEAF5_MAXPOP1, j__L_Leaf5GetPopToWords) #define JL_LEAF6GROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJL_LEAF6_MAXPOP1, j__L_Leaf6PopToWords) + J__U_GROWCK(Pop1, cJL_LEAF6_MAXPOP1, j__L_Leaf6GetPopToWords) #define JL_LEAF7GROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJL_LEAF7_MAXPOP1, j__L_Leaf7PopToWords) + J__U_GROWCK(Pop1, cJL_LEAF7_MAXPOP1, j__L_Leaf7GetPopToWords) #endif #define JL_LEAFWGROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJL_LEAFW_MAXPOP1, j__L_LeafWPopToWords) + J__U_GROWCK(Pop1, cJL_LEAFW_MAXPOP1, j__L_LeafWGetPopToWords) #define JL_LEAFVGROWINPLACE(Pop1) \ - J__U_GROWCK(Pop1, cJU_BITSPERSUBEXPL, j__L_LeafVPopToWords) + J__U_GROWCK(Pop1, cJU_BITSPERSUBEXPL, j__L_LeafVGetPopToWords) -#define JL_LEAF1VALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_Leaf1Offset[Pop1]) -#define JL_LEAF2VALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_Leaf2Offset[Pop1]) -#define JL_LEAF3VALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_Leaf3Offset[Pop1]) +#define JL_LEAF1VALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_Leaf1GetOffset(Pop1)) +#define JL_LEAF2VALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_Leaf2GetOffset(Pop1)) +#define JL_LEAF3VALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_Leaf3GetOffset(Pop1)) #ifdef JU_64BIT -#define JL_LEAF4VALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_Leaf4Offset[Pop1]) -#define JL_LEAF5VALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_Leaf5Offset[Pop1]) -#define JL_LEAF6VALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_Leaf6Offset[Pop1]) -#define JL_LEAF7VALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_Leaf7Offset[Pop1]) +#define JL_LEAF4VALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_Leaf4GetOffset(Pop1)) +#define JL_LEAF5VALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_Leaf5GetOffset(Pop1)) +#define JL_LEAF6VALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_Leaf6GetOffset(Pop1)) +#define JL_LEAF7VALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_Leaf7GetOffset(Pop1)) #endif -#define JL_LEAFWVALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_LeafWOffset[Pop1]) +#define JL_LEAFWVALUEAREA(Pjv,Pop1) (((PWord_t)(Pjv)) + j__L_LeafWGetOffset(Pop1)) -#define JL_LEAF1POPTOWORDS(Pop1) (j__L_Leaf1PopToWords[Pop1]) -#define JL_LEAF2POPTOWORDS(Pop1) (j__L_Leaf2PopToWords[Pop1]) -#define JL_LEAF3POPTOWORDS(Pop1) (j__L_Leaf3PopToWords[Pop1]) +#define JL_LEAF1POPTOWORDS(Pop1) (j__L_Leaf1GetPopToWords(Pop1)) +#define JL_LEAF2POPTOWORDS(Pop1) (j__L_Leaf2GetPopToWords(Pop1)) +#define JL_LEAF3POPTOWORDS(Pop1) (j__L_Leaf3GetPopToWords(Pop1)) #ifdef JU_64BIT -#define JL_LEAF4POPTOWORDS(Pop1) (j__L_Leaf4PopToWords[Pop1]) -#define JL_LEAF5POPTOWORDS(Pop1) (j__L_Leaf5PopToWords[Pop1]) -#define JL_LEAF6POPTOWORDS(Pop1) (j__L_Leaf6PopToWords[Pop1]) -#define JL_LEAF7POPTOWORDS(Pop1) (j__L_Leaf7PopToWords[Pop1]) +#define JL_LEAF4POPTOWORDS(Pop1) (j__L_Leaf4GetPopToWords(Pop1)) +#define JL_LEAF5POPTOWORDS(Pop1) (j__L_Leaf5GetPopToWords(Pop1)) +#define JL_LEAF6POPTOWORDS(Pop1) (j__L_Leaf6GetPopToWords(Pop1)) +#define JL_LEAF7POPTOWORDS(Pop1) (j__L_Leaf7GetPopToWords(Pop1)) #endif -#define JL_LEAFWPOPTOWORDS(Pop1) (j__L_LeafWPopToWords[Pop1]) -#define JL_LEAFVPOPTOWORDS(Pop1) (j__L_LeafVPopToWords[Pop1]) +#define JL_LEAFWPOPTOWORDS(Pop1) (j__L_LeafWGetPopToWords(Pop1)) +#define JL_LEAFVPOPTOWORDS(Pop1) (j__L_LeafVGetPopToWords(Pop1)) // FUNCTIONS TO ALLOCATE OBJECTS: