Changeset 23508 for main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_m.h
- Timestamp:
- 2010-12-17T14:04:10+13:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_m.h
r16583 r23508 50 50 #define POSITIVE(f, x) \ 51 51 if ((x)<=0) \ 52 fprintf(stderr,"Error: Cannot "#f" encode % lu\n",(unsignedlong)x),exit(1);52 fprintf(stderr,"Error: Cannot "#f" encode %d\n",(mg_u_long)x),exit(1); 53 53 54 54 … … 75 75 #define UNARY_ENCODE(x) \ 76 76 do { \ 77 register unsignedlong _B_x = (x); \77 register mg_u_long _B_x = (x); \ 78 78 BIO_ENCODE_PROLOGUE; \ 79 79 POSITIVE(unary, _B_x); \ … … 85 85 #define UNARY_ENCODE_L(x, count) \ 86 86 do { \ 87 register unsignedlong _B_x = (x); \87 register mg_u_long _B_x = (x); \ 88 88 BIO_ENCODE_PROLOGUE; \ 89 89 POSITIVE(unary, _B_x); \ … … 124 124 #define BINARY_ENCODE(x, b) \ 125 125 do { \ 126 register unsignedlong _B_x = (x); \127 register unsignedlong _B_b = (b); \126 register mg_u_long _B_x = (x); \ 127 register mg_u_long _B_b = (b); \ 128 128 register int _B_nbits, _B_logofb, _B_thresh; \ 129 129 BIO_ENCODE_PROLOGUE; \ … … 145 145 #define BINARY_ENCODE_L(x, b, count) \ 146 146 do { \ 147 register unsignedlong _B_x = (x); \148 register unsignedlong _B_b = (b); \147 register mg_u_long _B_x = (x); \ 148 register mg_u_long _B_b = (b); \ 149 149 register int _B_nbits, _B_logofb, _B_thresh; \ 150 150 BIO_ENCODE_PROLOGUE; \ … … 168 168 #define BINARY_DECODE(x, b) \ 169 169 do { \ 170 register unsignedlong _B_x = 0; \171 register unsignedlong _B_b = (b); \170 register mg_u_long _B_x = 0; \ 171 register mg_u_long _B_b = (b); \ 172 172 register int _B_i, _B_logofb, _B_thresh; \ 173 173 BIO_DECODE_PROLOGUE; \ … … 193 193 #define BINARY_DECODE_L(x, b, count) \ 194 194 do { \ 195 register unsignedlong _B_x = 0; \196 register unsignedlong _B_b = (b); \195 register mg_u_long _B_x = 0; \ 196 register mg_u_long _B_b = (b); \ 197 197 register int _B_i, _B_logofb, _B_thresh; \ 198 198 BIO_DECODE_PROLOGUE; \ … … 220 220 #define BINARY_LENGTH(x, b, count) \ 221 221 do { \ 222 register unsignedlong _B_x = (x); \223 register unsignedlong _B_b = (b); \222 register mg_u_long _B_x = (x); \ 223 register mg_u_long _B_b = (b); \ 224 224 register int _B_nbits, _B_logofb, _B_thresh; \ 225 225 POSITIVE(binary, _B_x); \ … … 240 240 #define GAMMA_ENCODE(x) \ 241 241 do { \ 242 register unsignedlong _B_xx = (x); \242 register mg_u_long _B_xx = (x); \ 243 243 register int _B_logofb; \ 244 244 register int _B_nbits; \ … … 255 255 #define GAMMA_ENCODE_L(x, count) \ 256 256 do { \ 257 register unsignedlong _B_xx = (x); \257 register mg_u_long _B_xx = (x); \ 258 258 register int _B_logofb; \ 259 259 register int _B_nbits; \ … … 271 271 #define GAMMA_DECODE(x) \ 272 272 do { \ 273 register unsignedlong _B_xx = 1; \273 register mg_u_long _B_xx = 1; \ 274 274 register int _B_nbits = 0; \ 275 275 BIO_DECODE_PROLOGUE; \ … … 283 283 #define GAMMA_DECODE_L(x, count) \ 284 284 do { \ 285 register unsignedlong _B_xx = 1; \285 register mg_u_long _B_xx = 1; \ 286 286 register int _B_nbits = 0; \ 287 287 BIO_DECODE_PROLOGUE; \ … … 296 296 #define GAMMA_LENGTH(x, count) \ 297 297 do { \ 298 register unsignedlong _B_xx = (x); \298 register mg_u_long _B_xx = (x); \ 299 299 register int _B_logofb; \ 300 300 POSITIVE(gamma, _B_xx); \ … … 310 310 #define DELTA_ENCODE(x) \ 311 311 do { \ 312 register unsignedlong _B_xxx = (x); \312 register mg_u_long _B_xxx = (x); \ 313 313 register int _B_logx; \ 314 314 FLOORLOG_2(_B_xxx, _B_logx); \ … … 319 319 #define DELTA_ENCODE_L(x, count) \ 320 320 do { \ 321 register unsignedlong _B_xxx = (x); \321 register mg_u_long _B_xxx = (x); \ 322 322 register int _B_logx; \ 323 323 FLOORLOG_2(_B_xxx, _B_logx); \ … … 329 329 #define DELTA_DECODE(x) \ 330 330 do { \ 331 register unsignedlong _B_xxx; \331 register mg_u_long _B_xxx; \ 332 332 register int _B_logx; \ 333 333 GAMMA_DECODE(_B_logx); --_B_logx; \ … … 338 338 #define DELTA_DECODE_L(x, count) \ 339 339 do { \ 340 register unsignedlong _B_xxx; \340 register mg_u_long _B_xxx; \ 341 341 register int _B_logx; \ 342 342 GAMMA_DECODE_L(_B_logx, count); --_B_logx; \ … … 347 347 #define DELTA_LENGTH(x, count) \ 348 348 do { \ 349 register unsignedlong _B_xxx = (x); \349 register mg_u_long _B_xxx = (x); \ 350 350 register int _B_logx, _B_dcount; \ 351 351 FLOORLOG_2(_B_xxx, _B_logx); \ … … 363 363 #define ELIAS_ENCODE(x, b, s) \ 364 364 do { \ 365 register unsignedlong _B_xx = (x); \366 register unsignedlong _B_b = (b); \365 register mg_u_long _B_xx = (x); \ 366 register mg_u_long _B_b = (b); \ 367 367 register double _B_s = (s); \ 368 368 register int _B_lower=1, _B_upper=1; \ … … 383 383 #define ELIAS_ENCODE_L(x, b, s, count) \ 384 384 do { \ 385 register unsignedlong _B_xx = (x); \386 register unsignedlong _B_b = (b); \385 register mg_u_long _B_xx = (x); \ 386 register mg_u_long _B_b = (b); \ 387 387 register double _B_s = (s); \ 388 388 register int _B_lower=1, _B_upper=1; \ … … 403 403 #define ELIAS_DECODE(x, b, s) \ 404 404 do { \ 405 register unsignedlong _B_xx; \406 register unsignedlong _B_b = (b); \405 register mg_u_long _B_xx; \ 406 register mg_u_long _B_b = (b); \ 407 407 register double _B_s = (s); \ 408 408 register int _B_lower=1, _B_upper=1; \ … … 423 423 #define ELIAS_DECODE_L(x, b, s, count) \ 424 424 do { \ 425 register unsignedlong _B_xx; \426 register unsignedlong _B_b = (b); \425 register mg_u_long _B_xx; \ 426 register mg_u_long _B_b = (b); \ 427 427 register double _B_s = (s); \ 428 428 register int _B_lower=1, _B_upper=1; \ … … 443 443 #define ELIAS_LENGTH(x, b, s, count) \ 444 444 do { \ 445 register unsignedlong _B_xx = (x); \446 register unsignedlong _B_b = (b); \445 register mg_u_long _B_xx = (x); \ 446 register mg_u_long _B_b = (b); \ 447 447 register double _B_s = (s); \ 448 448 register int _B_lower=1, _B_upper=1; \ … … 468 468 #define BBLOCK_ENCODE(x, b) \ 469 469 do { \ 470 register unsignedlong _B_xx = (x); \471 register unsignedlong _B_bb = (b); \470 register mg_u_long _B_xx = (x); \ 471 register mg_u_long _B_bb = (b); \ 472 472 register int _B_xdivb = 0; \ 473 473 POSITIVE(bblock, _B_xx); \ … … 484 484 #define BBLOCK_ENCODE_L(x, b, count) \ 485 485 do { \ 486 register unsignedlong _B_xx = (x); \487 register unsignedlong _B_bb = (b); \486 register mg_u_long _B_xx = (x); \ 487 register mg_u_long _B_bb = (b); \ 488 488 register int _B_xdivb = 0; \ 489 489 POSITIVE(bblock, _B_xx); \ … … 500 500 #define BBLOCK_DECODE(x, b) \ 501 501 do { \ 502 register unsignedlong _B_x1, _B_xx = 0; \503 register unsignedlong _B_bb = (b); \502 register mg_u_long _B_x1, _B_xx = 0; \ 503 register mg_u_long _B_bb = (b); \ 504 504 register int _B_xdivb; \ 505 505 UNARY_DECODE(_B_xdivb); --_B_xdivb; \ … … 512 512 #define BBLOCK_DECODE_L(x, b, count) \ 513 513 do { \ 514 register unsignedlong _B_x1, _B_xx = 0; \515 register unsignedlong _B_bb = (b); \514 register mg_u_long _B_x1, _B_xx = 0; \ 515 register mg_u_long _B_bb = (b); \ 516 516 register int _B_xdivb; \ 517 517 UNARY_DECODE_L(_B_xdivb, count); --_B_xdivb; \ … … 524 524 #define BBLOCK_LENGTH(x, b, count) \ 525 525 do { \ 526 register unsignedlong _B_bcount, _B_xx = (x); \527 register unsignedlong _B_bb = (b); \526 register mg_u_long _B_bcount, _B_xx = (x); \ 527 register mg_u_long _B_bb = (b); \ 528 528 register int _B_xdivb = 0; \ 529 529 POSITIVE(bblock, _B_xx); \
Note:
See TracChangeset
for help on using the changeset viewer.