diff --git a/tcc.h b/tcc.h
index 48a42f26..8e794301 100644
--- a/tcc.h
+++ b/tcc.h
@@ -228,6 +228,10 @@
 #define true 1
 typedef int BOOL;
 
+#ifndef _STATIC_ASSERT
+#define _STATIC_ASSERT(cond) do { (void) sizeof(char [1 - 2*!(cond)]); } while(0)
+#endif
+
 #define INCLUDE_STACK_SIZE  32
 #define IFDEF_STACK_SIZE    64
 #define VSTACK_SIZE         256
diff --git a/tccgen.c b/tccgen.c
index b9142d27..5a79f491 100644
--- a/tccgen.c
+++ b/tccgen.c
@@ -458,8 +458,6 @@ static void vseti(int r, int v)
 
 ST_FUNC void vswap(void)
 {
-    SValue tmp;
-
     /* cannot let cpu flags if other instruction are generated. Also
        avoid leaving VT_JMP anywhere except on the top of the stack
        because it would complicate the code generator. */
@@ -468,9 +466,35 @@ ST_FUNC void vswap(void)
         if (v == VT_CMP || (v & ~1) == VT_JMP)
             gv(RC_INT);
     }
-    tmp = vtop[0];
-    vtop[0] = vtop[-1];
-    vtop[-1] = tmp;
+
+    /*
+     * vtop[0], vtop[-1] = vtop[-1], vtop[0]
+     *
+     * vswap is called often and exchanging vtop[0] vs vtop[-1] is hot on
+     * profile, so it is hand optimized
+     */
+    unsigned long *vtopl = (unsigned long *)vtop;
+#   define VSIZEL (sizeof(*vtop) / sizeof(*vtopl))
+
+    _STATIC_ASSERT( VSIZEL*sizeof(*vtopl) == sizeof(*vtop) );
+    _STATIC_ASSERT( VSIZEL <= 16 ); /* should be enough */
+    switch(VSIZEL) {
+#   define VSWAPL(i) \
+    case i+1: { \
+        unsigned long tmpl; \
+        tmpl = vtopl[i];    \
+        vtopl[i] = vtopl[-1*VSIZEL + i];    \
+        vtopl[-1*VSIZEL + i] = tmpl;    \
+      } do {} while (0)
+
+    VSWAPL(15); VSWAPL(14); VSWAPL(13); VSWAPL(12);
+    VSWAPL(11); VSWAPL(10); VSWAPL( 9); VSWAPL( 8);
+    VSWAPL( 7); VSWAPL( 6); VSWAPL( 5); VSWAPL( 4);
+    VSWAPL( 3); VSWAPL( 2); VSWAPL( 1); VSWAPL( 0);
+    }
+
+#   undef VSWAPL
+#   undef VSIZEL
 }
 
 ST_FUNC void vpushv(SValue *v)