Changeset 27805 in webkit for trunk/JavaScriptCore/pcre/pcre_internal.h

Timestamp:

Nov 14, 2007, 6:00:15 PM (18 years ago)

Author:

[email protected]

Message:

2007-11-14 Eric Seidel <​[email protected]>

Reviewed by Geoff.

Another round of PCRE cleanups: inlines

SunSpider claims that this, combined with my previous PCRE cleanup were a 0.7% speedup, go figure.

• pcre/pcre_compile.cpp: (jsRegExpCompile):
• pcre/pcre_exec.cpp: (match): (jsRegExpExecute):
• pcre/pcre_internal.h: (PUT): (GET): (PUT2): (GET2): (isNewline):

File:

• trunk/JavaScriptCore/pcre/pcre_internal.h (modified) (3 diffs)

trunk/JavaScriptCore/pcre/pcre_internal.h

@@ -174 +174 @@
 #if LINK_SIZE == 2
 
-#define PUT(a,n,d)   \
-  (a[n] = (d) >> 8), \
-  (a[(n)+1] = (d) & 255)
-
-#define GET(a,n) \
-  (((a)[n] << 8) | (a)[(n)+1])
+static inline void PUT(uschar* a, size_t n, unsigned short d)
+{
+    a[n] = d >> 8;
+    a[n+1] = d & 255;
+}
+
+static inline short GET(const uschar* a, size_t n)
+{
+    return ((a[n] << 8) | a[n + 1]);
+}
 
 #define MAX_PATTERN_SIZE (1 << 16)
 
-
 #elif LINK_SIZE == 3
 
-#define PUT(a,n,d)       \
-  (a[n] = (d) >> 16),    \
-  (a[(n)+1] = (d) >> 8), \
-  (a[(n)+2] = (d) & 255)
-
-#define GET(a,n) \
-  (((a)[n] << 16) | ((a)[(n)+1] << 8) | (a)[(n)+2])
+static inline void PUT(uschar* a, size_t n, unsigned d)
+{
+    a[n] = d >> 16;
+    a[n+1] = d >> 8;
+    a[n+2] = d & 255;
+}
+
+static inline int GET(const uschar* a, size_t n)
+{
+    return ((a[n] << 16) | (a[n+1] << 8) | a[n+2]);
+}
 
 #define MAX_PATTERN_SIZE (1 << 24)
 
-
 #elif LINK_SIZE == 4
 
-#define PUT(a,n,d)        \
-  (a[n] = (d) >> 24),     \
-  (a[(n)+1] = (d) >> 16), \
-  (a[(n)+2] = (d) >> 8),  \
-  (a[(n)+3] = (d) & 255)
-
-#define GET(a,n) \
-  (((a)[n] << 24) | ((a)[(n)+1] << 16) | ((a)[(n)+2] << 8) | (a)[(n)+3])
+static inline void PUT(uschar* a, size_t n, unsigned d)
+{
+    a[n] = d >> 24;
+    a[n+1] = d >> 16;
+    a[n+2] = d >> 8;
+    a[n+3] = d & 255;
+}
+
+static inline int GET(const uschar* a, size_t n)
+{
+    return ((a[n] << 24) | (a[n+1] << 16) | (a[n+2] << 8) | a[n+3]);
+}
 
 #define MAX_PATTERN_SIZE (1 << 30)   /* Keep it positive */
-
 
 #else
@@ -225 +234 @@
 capturing parenthesis numbers in back references. */
 
-#define PUT2(a,n,d)   \
-  a[n] = (d) >> 8; \
-  a[(n)+1] = (d) & 255
-
-#define GET2(a,n) \
-  (((a)[n] << 8) | (a)[(n)+1])
-
+static inline void PUT2(uschar* a, size_t n, unsigned short d)
+{
+    a[n] = d >> 8;
+    a[n+1] = d & 255;
+}
+
+static inline short GET2(const uschar* a, size_t n)
+{
+    return ((a[n] << 8) | a[n + 1]);
+}
+
+// FIXME: This can't be a static inline yet, because it's passed register values by some callers
+// you can't take the address of a register
 #define PUT2INC(a,n,d)  PUT2(a,n,d), a += 2
-
 
 /* When UTF-8 encoding is being used, a character is no longer just a single
@@ -593 +607 @@
 extern BOOL        _pcre_xclass(int, const uschar *);
 
-#define IS_NEWLINE(nl) ((nl) == 0xA || (nl) == 0xD || (nl) == 0x2028 || (nl) == 0x2029)
+static inline bool isNewline(pcre_uchar nl)
+{
+    return (nl == 0xA || nl == 0xD || nl == 0x2028 || nl == 0x2029);
+}
 
 #endif