Index: csl/byterun/intern.c
diff -c csl/byterun/intern.c:1.50 csl/byterun/intern.c:1.52
*** csl/byterun/intern.c:1.50	Thu Dec 12 19:59:11 2002
--- csl/byterun/intern.c	Sat Dec 20 11:57:38 2003
***************
*** 15,20 ****
--- 15,22 ----
  
  /* Structured input, compact format */
  
+ /* The interface of this file is "intext.h" */
+ 
  #include <string.h>
  #include "alloc.h"
  #include "custom.h"
***************
*** 496,502 ****
  
  CAMLexport value input_value_from_malloc(char * data, long ofs)
  {
!   mlsize_t magic, block_len;
    value obj;
  
    intern_input = (unsigned char *) data;
--- 498,505 ----
  
  CAMLexport value input_value_from_malloc(char * data, long ofs)
  {
!   uint32 magic;
!   mlsize_t block_len;
    value obj;
  
    intern_input = (unsigned char *) data;
***************
*** 514,520 ****
  
  CAMLexport value input_value_from_block(char * data, long len)
  {
!   mlsize_t magic, block_len;
    value obj;
  
    intern_input = (unsigned char *) data;
--- 517,524 ----
  
  CAMLexport value input_value_from_block(char * data, long len)
  {
!   uint32 magic;
!   mlsize_t block_len;
    value obj;
  
    intern_input = (unsigned char *) data;
Index: csl/asmrun/amd64.S
diff -c csl/asmrun/amd64.S:1.1 csl/asmrun/amd64.S:1.3
*** csl/asmrun/amd64.S:1.1	Mon Jun 30 10:28:45 2003
--- csl/asmrun/amd64.S	Sat Dec 20 12:05:51 2003
***************
*** 252,258 ****
  FUNCTION(raise_caml_exception)
          movq    %rdi, %rax
          movq    caml_exception_pointer(%rip), %rsp
!         popq    caml_exception_pointer(%rip)
          ret
  
  /* Callback from C to Caml */
--- 252,259 ----
  FUNCTION(raise_caml_exception)
          movq    %rdi, %rax
          movq    caml_exception_pointer(%rip), %rsp
!         popq    %r14                  /* Recover previous exception handler */
!         movq    young_ptr(%rip), %r15 /* Reload alloc ptr */
          ret
  
  /* Callback from C to Caml */