Fix bootstrap and add legacy CI (#126)

* proper bootstrap

* add legacy CI

* prefix functions with caml_

* remove failing CI steps

Author: riaqn

.github/workflows/legacy-build.yml

@@ -0,0 +1,49 @@
+name: build-legacy
+
+on: [push, pull_request]
+
+jobs:
+  full-flambda:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Packages
+      run: |
+        sudo apt-get update -y && sudo apt-get install -y texlive-latex-extra texlive-fonts-recommended
+  # Ensure that make distclean can be run from an empty tree
+    - name: distclean
+      run: |
+        MAKE_ARG=-j make distclean
+    - name: configure tree
+      run: |
+        MAKE_ARG=-j XARCH=x64 CONFIG_ARG='--enable-flambda --enable-dependency-generation' OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh configure
+    - name: Build
+      run: |
+        MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh build
+    - name: Run the testsuite
+      run: |
+        MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh test
+  full-flambda-local:
+    runs-on: ubuntu-latest
+    env:
+      OCAMLPARAM: "_,extension=local"
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Packages
+      run: |
+        sudo apt-get update -y && sudo apt-get install -y texlive-latex-extra texlive-fonts-recommended
+  # Ensure that make distclean can be run from an empty tree
+    - name: distclean
+      run: |
+        MAKE_ARG=-j make distclean
+    - name: configure tree
+      run: |
+        MAKE_ARG=-j XARCH=x64 CONFIG_ARG='--enable-flambda --enable-dependency-generation' OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh configure
+    - name: Build
+      run: |
+        MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh build
+    - name: Run the testsuite
+      run: |
+        MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh test

boot/ocamlc

@@ -47,7 +47,7 @@ frame_descr * caml_next_frame_descriptor(uintnat * pc, char ** sp)
     /* Skip to next frame */
     if (d->frame_size != 0xFFFF) {
       /* Regular frame, update sp/pc and return the frame descriptor */
-      *sp += (get_frame_size(d) & 0xFFFFFFFC);
+      *sp += (caml_get_frame_size(d) & 0xFFFFFFFC);
       *pc = Saved_return_address(*sp);
 #ifdef Mask_already_scanned
       *pc = Mask_already_scanned(*pc);
@@ -169,13 +169,13 @@ static debuginfo debuginfo_extract(frame_descr* d, int alloc_idx)
   /* The special frames marking the top of an ML stack chunk are never
      returned by caml_next_frame_descriptor, so should never reach here. */
   CAMLassert(d->frame_size != 0xFFFF);
-  frame_size = get_frame_size(d);
+  frame_size = caml_get_frame_size(d);
 
   if ((frame_size & 1) == 0) {
     return NULL;
   }
   /* Recover debugging info */
-  infoptr = get_end_of_live_ofs(d);
+  infoptr = caml_get_end_of_live_ofs(d);
   if (frame_size & 2) {
     CAMLassert(alloc_idx == -1 || (0 <= alloc_idx && alloc_idx < *infoptr));
     /* skip alloc_lengths */

boot/ocamllex

@@ -123,8 +123,8 @@ typedef struct {
 } frame_descr_long;
 
 /* Helpers for long frames */
-uint32_t get_frame_size(frame_descr *);
-unsigned char * get_end_of_live_ofs (frame_descr *d);
+uint32_t caml_get_frame_size(frame_descr *);
+unsigned char * caml_get_end_of_live_ofs (frame_descr *d);
 
 /* Allocation lengths are encoded as 0-255, giving sizes 1-256 */
 #define Wosize_encoded_alloc_len(n) ((uintnat)(n) + 1)

runtime/backtrace_nat.c

@@ -83,7 +83,7 @@ static link* frametables_list_tail(link *list) {
 /* Special marker instead of frame_size for frame_descr in long format */
 static uint32_t LONG_FRAME_MARKER = 0x7FFF;
 
-uint32_t get_frame_size(frame_descr *d) {
+uint32_t caml_get_frame_size(frame_descr *d) {
   CAMLassert(d && d->frame_size != 0xFFFF);
   if (d->frame_size == LONG_FRAME_MARKER) {
     /* Handle long frames */
@@ -95,7 +95,7 @@ uint32_t get_frame_size(frame_descr *d) {
 }
 
 /* Skip to end of live_ofs */
-unsigned char * get_end_of_live_ofs (frame_descr *d) {
+unsigned char * caml_get_end_of_live_ofs (frame_descr *d) {
   CAMLassert(d && d->frame_size != 0xFFFF);
   if (d->frame_size == LONG_FRAME_MARKER) {
     /* Handle long frames */
@@ -111,8 +111,8 @@ static frame_descr * next_frame_descr(frame_descr * d) {
   uint32_t frame_size;
   CAMLassert(d->retaddr >= 4096);
   if (d->frame_size != 0xFFFF) {
-    frame_size = get_frame_size(d);
-    p = get_end_of_live_ofs(d);
+    frame_size = caml_get_frame_size(d);
+    p = caml_get_end_of_live_ofs(d);
     /* Skip alloc_lengths if present */
     if (frame_size & 2) {
       num_allocs = *p;
@@ -688,7 +688,7 @@ void caml_do_local_roots_nat(scanning_action maj, scanning_action min,
           }
         }
         /* Move to next frame */
-        sp += (get_frame_size(d) & 0xFFFFFFFC);
+        sp += (caml_get_frame_size(d) & 0xFFFFFFFC);
         retaddr = Saved_return_address(sp);
 #ifdef Mask_already_scanned
         retaddr = Mask_already_scanned(retaddr);

runtime/caml/stack.h

@@ -73,12 +73,12 @@ void caml_garbage_collection(void)
     }
     /* Must be an allocation frame */
     CAMLassert(d && d->frame_size != 0xFFFF &&
-               (get_frame_size(d) & 2));
+               (caml_get_frame_size(d) & 2));
   }
 
   /* Compute the total allocation size at this point,
      including allocations combined by Comballoc */
-  alloc_len = get_end_of_live_ofs(d);
+  alloc_len = caml_get_end_of_live_ofs(d);
   nallocs = *alloc_len++;
 
   if (nallocs == 0) {