@@ -3,7 +3,8 @@ Objective Caml 3.10.2: Bug fixes: - PR#1217 (partial) Typo in ocamldep man page -- PR#4339 continued: ocamlopt problems on HPPA +- PR#3952 (partial) ocamlopt: allocation problems on ARM +- PR#4339 (continued) ocamlopt: problems on HPPA - PR#4455 str.mli not installed under Windows - PR#4473 crash when accessing float array with polymorphic method - PR#4480 runtime would not compile without gcc extensions Changes @@ -91,11 +91,13 @@ caml_allocN: /* Record return address and desired size */ ldr alloc_limit, .Lcaml_last_return_address str lr, [alloc_limit, #0] - str r10, .Lcaml_requested_size + ldr alloc_limit, .LLcaml_requested_size + str r10, [alloc_limit, #0] /* Invoke GC */ bl .Linvoke_gc /* Try again */ - ldr r10, .Lcaml_requested_size + ldr r10, .LLcaml_requested_size + ldr r10, [r10, #0] b caml_allocN /* Shared code to invoke the GC */ @@ -323,9 +325,12 @@ caml_ml_array_bound_error: .LLtrap_handler: .word .Ltrap_handler .Lcaml_apply2: .word caml_apply2 .Lcaml_apply3: .word caml_apply3 -.Lcaml_requested_size: .word 0 +.LLcaml_requested_size: .word .Lcaml_requested_size .Lcaml_array_bound_error: .word caml_array_bound_error +.data +.Lcaml_requested_size: .word 0 + /* GC roots for callback */ .data asmrun/arm.S f88feb9e23f480346a7dde8b5b1b77bcaf2b4ce9 xleroy xleroy http://github.com/thelema/ocaml-community/commit/fa7f3591fd677894fa600e73d38672774dd470d1 fa7f3591fd677894fa600e73d38672774dd470d1 2008-02-20T04:25:17-08:00 2008-02-20T04:25:17-08:00 PR#3952: crash in caml_alloc on ARM 5c102d1a1731bc3e1fee6ff22495fa3c3011b4b4 xleroy xleroy