Browse Source

merge from trunk: remove asm from processor, it just cant be implemented in processor

git-svn-id: svn://svn.lighttpd.net/xcache/branches/3.0@1417 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.0
Xuefer 8 years ago
parent
commit
799496424c
  1. 1
      devel/run
  2. 9
      processor/hashtable.m4
  3. 4
      processor/main.m4
  4. 2
      processor/struct.m4

1
devel/run

@ -171,6 +171,7 @@ do_phpize() { # {{{1
--enable-xcache-encoder \
--enable-xcache-decoder \
--enable-xcache-disassembler \
--enable-xcache-assembler \
--enable-xcache-coverager \
--enable-xcache-test \
--enable-xcache-dprint \

9
processor/hashtable.m4

@ -74,12 +74,9 @@ define(`DEF_HASH_TABLE_FUNC', `
IFCALCCOPY(`size_t bucketsize;')
#if defined(HARDENING_PATCH_HASH_PROTECT) && HARDENING_PATCH_HASH_PROTECT
IFASM(`dst->canary = zend_hash_canary; DONE(canary)', `
dnl elseif
IFRESTORE(`dst->canary = zend_hash_canary; DONE(canary)', `
dnl else
PROCESS(unsigned int, canary)
')
IFRESTORE(`dst->canary = zend_hash_canary; DONE(canary)', `
dnl else
PROCESS(unsigned int, canary)
')
#endif
PROCESS(uint, nTableSize)

4
processor/main.m4

@ -242,7 +242,6 @@ define(`IFRESTORE', `ifelse(PROCESSOR_TYPE, `restore', `$1', `$2')')
define(`IFCOPY', `IFSTORE(`$1', `IFRESTORE(`$1', `$2')')')
define(`IFCALCCOPY', `IFCALC(`$1', `IFCOPY(`$1', `$2')')')
define(`IFDPRINT', `ifelse(PROCESSOR_TYPE, `dprint', `$1', `$2')')
define(`IFASM', `ifelse(PROCESSOR_TYPE, `asm', `$1', `$2')')
define(`IFDASM', `ifelse(PROCESSOR_TYPE, `dasm', `$1', `$2')')
dnl }}}
EXPORT(`zend_op')
@ -279,8 +278,5 @@ REDEF(`PROCESSOR_TYPE', `dprint') include(srcdir`/processor/processor.m4')
#ifdef HAVE_XCACHE_DISASSEMBLER
REDEF(`PROCESSOR_TYPE', `dasm') include(srcdir`/processor/processor.m4')
#endif /* HAVE_XCACHE_DISASSEMBLER */
#ifdef HAVE_XCACHE_ASSEMBLER
REDEF(`PROCESSOR_TYPE', `asm') include(srcdir`/processor/processor.m4')
#endif /* HAVE_XCACHE_ASSEMBLER */
ifdef(`EXIT_PENDING', `m4exit(EXIT_PENDING)')

2
processor/struct.m4

@ -12,7 +12,6 @@ define(`DECL_STRUCT_P_FUNC', `translit(
IFSTORE( `xc_processor_t *processor, $1 *dst, const $1 * const src')
IFRESTORE(`xc_processor_t *processor, $1 *dst, const $1 * const src')
IFDASM( `xc_dasm_t *dasm, zval *dst, const $1 * const src')
IFASM( `$1 *dst, const $1 * const src')
TSRMLS_DC
)ifelse(`$3', `', `;')
popdef(`FUNC_NAME')dnl
@ -145,7 +144,6 @@ define(`STRUCT_P_EX', `
IFSTORE( `processor, $6 $2, $6 $3')
IFRESTORE(`processor, $6 $2, $6 $3')
IFDASM( `dasm, zv, $6 $3')
IFASM( `$6 $2, $6 $3')
TSRMLS_CC
);
IFDASM(`

Loading…
Cancel
Save