summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>1999-11-18 14:42:01 +0000
committerXavier Leroy <xavier.leroy@inria.fr>1999-11-18 14:42:01 +0000
commit65981ac3e6578fe146429f47df5172b07418e49d (patch)
tree1080309a614db3b1630d40a05eae9e5498b4086f
parent0acf301921fbd0cbf2d75dd06aec766095292355 (diff)
Bug dans le traitement des exceptions qui s'echappent d'un callback C -> Caml
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2563 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--asmrun/arm.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/asmrun/arm.S b/asmrun/arm.S
index 814ac631f..b34fe5683 100644
--- a/asmrun/arm.S
+++ b/asmrun/arm.S
@@ -244,9 +244,9 @@ caml_start_program:
/* The trap handler */
.Ltrap_handler:
- /* Save young_ptr */
- ldr r4, .Lyoung_ptr
- str alloc_ptr, [r4, #0]
+ /* Save exception pointer */
+ ldr r4, .Lcaml_exception_pointer
+ str trap_ptr, [r4, #0]
/* Encode exception bucket as an exception result */
orr r0, r0, #2
/* Return it */