Commit ca5da63d4dd01659593c61129d1cf465add5e41e
2017-01-01T22:02:33
md_collect_marks: Optimize in case of 8-bit encodings by eliminating some branches in the fast path.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
diff --git a/md4c/md4c.c b/md4c/md4c.c
index 02deb23..09dfb19 100644
--- a/md4c/md4c.c
+++ b/md4c/md4c.c
@@ -114,7 +114,11 @@ struct MD_CTX_tag {
int n_marks;
int alloc_marks;
+#if defined MD4C_USE_UTF16
char mark_char_map[128];
+#else
+ char mark_char_map[256];
+#endif
/* For resolving of inline spans. */
MD_MARKCHAIN mark_chains[7];
@@ -2442,15 +2446,20 @@ md_collect_marks(MD_CTX* ctx, const MD_LINE* lines, int n_lines, int table_mode)
while(TRUE) {
CHAR ch;
+#ifdef MD4C_USE_UTF16
+ /* For UTF-16, mark_char_map[] covers only ASCII. */
+ #define IS_MARK_CHAR(off) ((CH(off) < SIZEOF_ARRAY(ctx->mark_char_map)) && \
+ (ctx->mark_char_map[(unsigned char) CH(off)]))
+#else
+ /* For 8-bit encodings, mark_char_map[] covers all 256 elements. */
+ #define IS_MARK_CHAR(off) (ctx->mark_char_map[(unsigned char) CH(off)])
+#endif
+
/* Optimization: Fast path (with some loop unrolling). */
- while(off + 4 < line_end &&
- ((unsigned)CH(off+0) >= sizeof(ctx->mark_char_map) || !ctx->mark_char_map[(unsigned) CH(off+0)]) &&
- ((unsigned)CH(off+1) >= sizeof(ctx->mark_char_map) || !ctx->mark_char_map[(unsigned) CH(off+1)]) &&
- ((unsigned)CH(off+2) >= sizeof(ctx->mark_char_map) || !ctx->mark_char_map[(unsigned) CH(off+2)]) &&
- ((unsigned)CH(off+3) >= sizeof(ctx->mark_char_map) || !ctx->mark_char_map[(unsigned) CH(off+3)]))
+ while(off + 4 < line_end && !IS_MARK_CHAR(off+0) && !IS_MARK_CHAR(off+1)
+ && !IS_MARK_CHAR(off+2) && !IS_MARK_CHAR(off+3))
off += 4;
- while(off < line_end &&
- ((unsigned)CH(off+0) >= sizeof(ctx->mark_char_map) || !ctx->mark_char_map[(unsigned) CH(off+0)]))
+ while(off < line_end && !IS_MARK_CHAR(off+0))
off++;
if(off >= line_end)