pike.git/ src/ stralloc.c

2014-02-25

2014-02-25 14:37:23 by Per Hedbor <ph@opera.com>

• e9117b46c881fb9f385b60217e1c0211d0954168 (61 lines) (+29/-32) ^{[ Show | Annotate ]}
  Branch: 8.0

Unified INDEX_CHARP and generic_extract (and thus index_shared_string)

In non-debug mode indexing a shared string is now the same thing as
doing the old INDEX_CHARP, and thus actually noticeably faster.

However, INDEX_CHARP will be slower in debug mode since it will check
if the size_shift is >2. That seems rather harmless, though, since
debug mode is seldom used when performance matters.

256:    return 2;   }    - static INLINE p_wchar2 generic_extract (const void *str, int size, ptrdiff_t pos) - { -  switch(size) -  { -  case 0: return ((p_wchar0 *)str)[pos]; -  case 1: return ((p_wchar1 *)str)[pos]; -  case 2: return ((p_wchar2 *)str)[pos]; -  } - #ifdef PIKE_DEBUG -  Pike_fatal("Illegal shift size!\n"); - #endif -  return 0; - } -  - PMOD_EXPORT p_wchar2 index_shared_string(struct pike_string *s, -  ptrdiff_t pos) - { - #ifdef PIKE_DEBUG -  if(pos > s->len || pos<0) { -  if (s->len) { -  Pike_fatal("String index %"PRINTPTRDIFFT"d is out of " -  "range 0..%"PRINTPTRDIFFT"d.\n", -  pos, s->len-1); -  } else { -  Pike_fatal("Attempt to index the empty string with %"PRINTPTRDIFFT"d.\n", -  pos); -  } -  } - #endif -  return generic_extract(s->str,s->size_shift,pos); - } -  +    void low_set_index(struct pike_string *s, ptrdiff_t pos, int value)   {   #ifdef PIKE_DEBUG
409:   #define DM(X)   #endif    + PMOD_EXPORT p_wchar2 index_shared_string(struct pike_string *s, +  ptrdiff_t pos) + { +  if(pos > s->len || pos<0) { +  if (s->len) { +  Pike_fatal("String index %"PRINTPTRDIFFT"d is out of " +  "range 0..%"PRINTPTRDIFFT"d.\n", +  pos, s->len-1); +  } else { +  Pike_fatal("Attempt to index the empty string with %"PRINTPTRDIFFT"d.\n", +  pos); +  } +  } +  return generic_extract(s->str,s->size_shift,pos); + } +  + PMOD_EXPORT p_wchar2 generic_extract (const void *str, int size, ptrdiff_t pos) + { +  switch(size) +  { +  case 0: return ((p_wchar0 *)str)[pos]; +  case 1: return ((p_wchar1 *)str)[pos]; +  case 2: return ((p_wchar2 *)str)[pos]; +  } +  Pike_fatal("Unsupported string shift: %d\n", size); +  return 0; + } +    static void locate_problem(int (*isproblem)(struct pike_string *))   {    unsigned INT32 e;