Show
Ignore:
Timestamp:
07/10/05 10:12:34 (4 years ago)
Author:
zoeloelip
Message:

* Renamed some macros from MMC (mmcache) to EA (eg MMCG is now EAG)
* Added eA file header to mm.c, mm.h and x86-spinlocks.h
* Readded a hack to the loader to prevent zend2 segfaults

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • eaccelerator/trunk/encoder.c

    r57 r123  
    842842        unsigned int ops = op_dsc->ops; 
    843843        encode(opline->opcode); 
    844 #if MMC_ENCODER_VERSION < 2 
     844#if EA_ENCODER_VERSION < 2 
    845845        encode32(opline->lineno); 
    846846#endif 
    …… 
    867867            break; 
    868868          case EXT_FE: 
    869 #if MMC_ENCODER_VERSION >= 3 
     869#if EA_ENCODER_VERSION >= 3 
    870870            encode((unsigned char)opline->extended_value); 
    871871#endif 
    …… 
    992992  } 
    993993  encode_zval_hash(from->static_variables); 
    994 #if MMC_ENCODER_VERSION < 2 
     994#if EA_ENCODER_VERSION < 2 
    995995  encode_zstr(from->filename); 
    996996#endif 
    …… 
    10171017 
    10181018#ifdef ZEND_ENGINE_2 
    1019 #if MMC_ENCODER_VERSION < 2 
     1019#if EA_ENCODER_VERSION < 2 
    10201020  encode32(from->line_start); 
    10211021  encode32(from->line_end); 
    …… 
    10371037                          Bucket* f, Bucket *c) { 
    10381038  encode_zstr("EACCELERATOR"); 
    1039   encode32(MMC_ENCODER_VERSION); 
     1039  encode32(EA_ENCODER_VERSION); 
    10401040#ifdef ZEND_ENGINE_2 
    10411041  encode(2); 
    …… 
    10471047#ifdef ZEND_ENGINE_2 
    10481048    ce = *(zend_class_entry**)c->pData; 
    1049     encode(MMC_ENCODER_CLASS); 
     1049    encode(EA_ENCODER_CLASS); 
    10501050    encode_lstr(c->arKey, c->nKeyLength); 
    10511051    encode_class_entry(ce); 
    10521052#else 
    1053     encode(MMC_ENCODER_CLASS); 
     1053    encode(EA_ENCODER_CLASS); 
    10541054    encode_lstr(c->arKey, c->nKeyLength); 
    10551055    ce = (zend_class_entry*)c->pData; 
    …… 
    10581058    c = c->pListNext; 
    10591059  } 
    1060   encode(MMC_ENCODER_END); 
     1060  encode(EA_ENCODER_END); 
    10611061 
    10621062  while (f != NULL) { 
    1063     encode(MMC_ENCODER_FUNCTION); 
     1063    encode(EA_ENCODER_FUNCTION); 
    10641064    encode_lstr(f->arKey, f->nKeyLength); 
    10651065    encode_op_array((zend_op_array*)f->pData); 
    10661066    f = f->pListNext; 
    10671067  } 
    1068   encode(MMC_ENCODER_END); 
     1068  encode(EA_ENCODER_END); 
    10691069  encode_op_array(op_array); 
    10701070  return 1; 
    …… 
    11411141        f = CG(function_table)->pListTail; 
    11421142        c = CG(class_table)->pListTail; 
    1143         MMCG(compiler) = 1; 
    1144         MMCG(encoder) = 1; 
    1145         old_enabled = MMCG(enabled); 
    1146         MMCG(enabled) = 0; 
     1143        EAG(compiler) = 1; 
     1144        EAG(encoder) = 1; 
     1145        old_enabled = EAG(enabled); 
     1146        EAG(enabled) = 0; 
    11471147        zend_try 
    11481148        { 
    …… 
    12501250        zend_end_try(); 
    12511251 
    1252         MMCG(encoder) = 0; 
    1253         MMCG(compiler) = 0; 
    1254         MMCG(enabled) = old_enabled; 
     1252        EAG(encoder) = 0; 
     1253        EAG(compiler) = 0; 
     1254        EAG(enabled) = old_enabled; 
    12551255 
    12561256        f = f ? f->pListNext : CG(function_table)->pListHead;