~ chicken-core (chicken-5) 80be013d0da204c30bc30155fcf8dccdc84680b6

commit 80be013d0da204c30bc30155fcf8dccdc84680b6
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Fri Jul 17 12:05:31 2015 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Fri Jul 17 12:05:31 2015 +0200

    move arg-extraction after argc checks, minor cleanups

diff --git a/runtime.c b/runtime.c
index 27726cb7..c8d0769b 100644
--- a/runtime.c
+++ b/runtime.c
@@ -3648,7 +3648,7 @@ void handle_interrupt(void *trampoline)
   /* 18 <=> 2 headers + trampoline + 1 extra slot + 9 for interning + 5 for string */
   p = C_alloc(18 + n);
   proc = (C_word)p;
-  *(p++) = C_VECTOR_TYPE | C_BYTEBLOCK_BIT | (1 * sizeof(C_word));
+  *(p++) = C_VECTOR_TYPE | C_BYTEBLOCK_BIT | sizeof(C_word);
   *(p++) = (C_word)trampoline;
   state = (C_word)p;
   *(p++) = C_VECTOR_TYPE | (n + 1);
@@ -6021,11 +6021,12 @@ void C_ccall call_cc_wrapper(C_word c, C_word *av)
   C_word
     closure = av[ 0 ],
     /* av[ 1 ] is current k and ignored */
-    result = av[ 2 ],
+    result,
     k = C_block_item(closure, 1);
 
   if(c != 3) C_bad_argc(c, 3);
 
+  result = av[ 2 ];
   C_kontinue(k, result);
 }
 
@@ -6095,15 +6096,18 @@ void C_ccall C_apply_values(C_word c, C_word *av)
   C_word
     /* closure = av[ 0 ] */
     k = av[ 1 ],
-    lst = av[ 2 ],
+    lst,
     n;
 
   if(c != 3) C_bad_argc(c, 3);
 
+  lst = av[ 2 ];
+
   /* Check continuation wether it receives multiple values: */
   if(C_block_item(k, 0) == (C_word)values_continuation) {
-    C_word *av2;
-    C_word *ptr = C_temporary_stack_limit;
+    C_word 
+      *av2,
+      *ptr = C_temporary_stack_limit;
 
     for(n = 0; !C_immediatep(lst) && C_block_header(lst) == C_PAIR_TAG; ++n) {
       *(ptr++) = C_u_i_car(lst);