vte r2258 - in trunk: . src

[behdad svn gnome org]

Author: behdad
Date: Mon Dec  1 08:03:30 2008
New Revision: 2258
URL: http://svn.gnome.org/viewvc/vte?rev=2258&view=rev

Log:
2008-12-01  Behdad Esfahbod  <behdad gnome org>

        * src/vteseq.c: Some wild crack to build the vtable using gcc
        extension for labels as values.  The advantage is that we get down to
        an empty .data for vteseq.o but .text grows considerably.  And we have
        to use nested functions, and #define static auto.  It's really ugly.
        I'm going to remove it in the next commit or the one after.  Just
        wanted to record it here for posterity.



Modified:
   trunk/ChangeLog
   trunk/src/vteseq.c

Modified: trunk/src/vteseq.c
==============================================================================
--- trunk/src/vteseq.c	(original)
+++ trunk/src/vteseq.c	Mon Dec  1 08:03:30 2008
@@ -398,57 +398,48 @@
  * Sequence handling boilerplate
  */
 
+#if __GNUC__ >= 4
+#define USE_GCC_LABELS 1
+#endif
+
 
 #define VTE_SEQUENCE_HANDLER_SIGNATURE(name) \
 	void name (VteTerminal *terminal, \
 		   GValueArray *params)
 
-#define VTE_SEQUENCE_HANDLER_PROTO(name) \
-	static VTE_SEQUENCE_HANDLER_SIGNATURE (name)
-
-/* Prototype all handlers... */
-#define VTE_SEQUENCE_HANDLER(name) VTE_SEQUENCE_HANDLER_PROTO (name);
-#include "vteseq-list.h"
-#undef VTE_SEQUENCE_HANDLER
-
-
 
 
 /* The type of sequence handler handle. */
 
-#if 1
+#ifndef USE_GCC_LABELS
 
 typedef VTE_SEQUENCE_HANDLER_SIGNATURE((*VteTerminalSequenceHandler));
 #define VTE_SEQUENCE_HANDLER_REFERENCE(name) (name)
 #define vte_sequence_handler_invoke(handler, terminal, params) (handler) ((terminal), (params))
 #define VTE_SEQUENCE_HANDLER_INVOKE(handler, terminal, params) (handler) ((terminal), (params))
 
+
 #else
 
 typedef void *VteTerminalSequenceHandler;
 
-static void
-vte_sequence_handler_invoke (VteTerminalSequenceHandler handler,
-			     VteTerminal *terminal,
-			     GValueArray *params)
-{
-	goto *((char *) &&vte_sequence_handler__base_label + (gsize) handler);
-#define VTE_SEQUENCE_HANDLER(name) name: name (terminal, params); return;
-vte_sequence_handler__base_label: return;
-#include "vteseq-list.h"
-#undef VTE_SEQUENCE_HANDLER
-}
-
-
+#define VTE_SEQUENCE_HANDLER_LABEL0(name) name##_label
+#define VTE_SEQUENCE_HANDLER_LABEL(name) VTE_SEQUENCE_HANDLER_LABEL0(name)
 #define VTE_SEQUENCE_HANDLER_REFERENCE(name) \
-	((VteTerminalSequenceHandler) ((char *) &&name - (char *) && vte_sequence_handler__base_label))
+	((VteTerminalSequenceHandler) ((char *) &&VTE_SEQUENCE_HANDLER_LABEL(name) - (char *) && vte_sequence_handler__base_label))
+#define vte_sequence_handler_invoke(handler, terminal, params) \
+	vte_sequence_handler_invoke_internal ((handler), NULL, (terminal), (params))
 #define VTE_SEQUENCE_HANDLER_INVOKE(handler, terminal, params) \
 	vte_sequence_handler_invoke (VTE_SEQUENCE_HANDLER_REFERENCE (handler), (terminal), (params))
 
-#endif
-
 
+static void
+vte_sequence_handler_invoke_internal (VteTerminalSequenceHandler handler,
+				      const char *name2,
+				      VteTerminal *terminal2,
+				      GValueArray *params2);
 
+#endif
 
 
 /* Call another handler, offsetting any long arguments by the given
@@ -495,6 +486,46 @@
 		vte_sequence_handler_invoke (handler, terminal, NULL);
 }
 
+
+
+
+
+
+/* More boilerplate */
+
+#ifdef USE_GCC_LABELS
+static void
+vte_sequence_handler_invoke_internal (VteTerminalSequenceHandler handler,
+				      const char *name2,
+				      VteTerminal *terminal2,
+				      GValueArray *params2)
+{
+	/* Open-ended function.  Closes at the other end of the file! */
+
+/* Prototype all lables... */
+#define VTE_SEQUENCE_HANDLER(name) __label__ VTE_SEQUENCE_HANDLER_LABEL (name);
+	__label__ vte_sequence_handler__base_label;
+#include "vteseq-list.h"
+#undef VTE_SEQUENCE_HANDLER
+
+#define static auto
+
+#endif
+
+
+
+#define VTE_SEQUENCE_HANDLER_PROTO(name) \
+	static VTE_SEQUENCE_HANDLER_SIGNATURE (name)
+
+/* Prototype all handlers... */
+#define VTE_SEQUENCE_HANDLER(name) VTE_SEQUENCE_HANDLER_PROTO (name);
+#include "vteseq-list.h"
+#undef VTE_SEQUENCE_HANDLER
+
+
+
+
+
 /* Set icon/window titles. */
 static void
 vte_sequence_handler_set_title_internal(VteTerminal *terminal,
@@ -3281,20 +3312,28 @@
 }
 
 
-/* LOOKUP */
+
+
+
+
+
+
+/* More boilerplate */
+
 
 #define VTE_SEQUENCE_HANDLER(name) VTE_SEQUENCE_HANDLER_REFERENCE (name)
 
-static inline const struct vteseq_2_struct *
+static const struct vteseq_2_struct *
 vteseq_2_lookup (register const char *str, register unsigned int len);
 #include"vteseq-2.c"
 
-static inline const struct vteseq_n_struct *
+static const struct vteseq_n_struct *
 vteseq_n_lookup (register const char *str, register unsigned int len);
 #include"vteseq-n.c"
 
 #undef VTE_SEQUENCE_HANDLER
 
+
 static VteTerminalSequenceHandler
 _vte_sequence_get_handler (const char *name)
 {
@@ -3313,6 +3352,27 @@
 	}
 }
 
+#ifdef USE_GCC_LABELS
+
+#undef static
+
+	if (G_LIKELY (name2))
+    		handler = _vte_sequence_get_handler (name2);
+
+	goto *((char *) &&vte_sequence_handler__base_label + (gsize) handler);
+
+#define VTE_SEQUENCE_HANDLER(name) VTE_SEQUENCE_HANDLER_LABEL (name): name (terminal2, params2); return;
+vte_sequence_handler__base_label:
+		_vte_debug_print (VTE_DEBUG_MISC,
+				  "No handler for control sequence `%s' defined.\n",
+				  name2);
+		return;
+#include "vteseq-list.h"
+#undef VTE_SEQUENCE_HANDLER
+}
+
+#endif
+
 static void
 display_control_sequence(const char *name, GValueArray *params)
 {
@@ -3359,6 +3419,9 @@
 	_VTE_DEBUG_IF(VTE_DEBUG_PARSE)
 		display_control_sequence(match_s, params);
 
+#ifdef USE_GCC_LABELS
+	vte_sequence_handler_invoke_internal (NULL, match_s, terminal, params);
+#else
 	/* Find the handler for this control sequence. */
 	handler = _vte_sequence_get_handler (match_s);
 
@@ -3370,4 +3433,5 @@
 				  "No handler for control sequence `%s' defined.\n",
 				  match_s);
 	}
+#endif
 }