This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 2/6] vfprintf: Introduce JUMP_TABLE_BASE_LABEL
- From: Florian Weimer <fweimer at redhat dot com>
- To: libc-alpha at sourceware dot org
- Date: Sun, 1 Mar 2015 21:47:31 +0100
- Subject: [PATCH 2/6] vfprintf: Introduce JUMP_TABLE_BASE_LABEL
- Authentication-results: sourceware.org; auth=none
- References: <cover dot 1425246936 dot git dot fweimer at redhat dot com>
This makes the offset handling more explicit and avoids
cross-references between the jump tables.
---
stdio-common/vfprintf.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index d575994..16e70b8 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -304,7 +304,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
spec = (ChExpr); \
offset = NOT_IN_JUMP_RANGE (spec) ? REF (form_unknown) \
: table[CHAR_CLASS (spec)]; \
- ptr = &&do_form_unknown + offset; \
+ ptr = &&JUMP_TABLE_BASE_LABEL + offset; \
goto *ptr; \
} \
while (0)
@@ -1329,7 +1329,8 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
do
{
#ifdef SHARED
-# define REF(Name) &&do_##Name - &&do_form_unknown
+# define JUMP_TABLE_BASE_LABEL do_form_unknown
+# define REF(Name) &&do_##Name - &&JUMP_TABLE_BASE_LABEL
#else
# define REF(Name) &&do_##Name
#endif
@@ -1897,7 +1898,9 @@ do_positional:
{
#undef REF
#ifdef SHARED
-# define REF(Name) &&do2_##Name - &&do_form_unknown
+# undef JUMP_TABLE_BASE_LABEL
+# define JUMP_TABLE_BASE_LABEL do2_form_unknown
+# define REF(Name) &&do2_##Name - &&JUMP_TABLE_BASE_LABEL
#else
# define REF(Name) &&do2_##Name
#endif
--
2.1.0