logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

jamvm-1.6.0-aarch64-support.patch (23347B)

    

  1. From a44154f7a18496cc3e5fc0b1b2ea69523ebc623a Mon Sep 17 00:00:00 2001
  2. From: Simon South <simon@simonsouth.net>
  3. Date: Mon, 1 Jun 2020 07:09:34 -0400
  4. Subject: [PATCH] Add support for aarch64 on GNU/Linux
  6. ---
  7.  AUTHORS                           |   1 +
  8.  README                            |   2 +-
  9.  configure.ac                      |   7 +-
  10.  src/arch/Makefile.am              |   2 +-
  11.  src/arch/aarch64.h                | 147 +++++++++++++++++++++
  12.  src/jam.c                         |   3 +-
  13.  src/os/linux/Makefile.am          |   2 +-
  14.  src/os/linux/aarch64/Makefile.am  |  28 ++++
  15.  src/os/linux/aarch64/callNative.S | 212 ++++++++++++++++++++++++++++++
  16.  src/os/linux/aarch64/dll_md.c     |  59 +++++++++
  17.  src/os/linux/aarch64/init.c       |  51 +++++++
  18.  11 files changed, 508 insertions(+), 6 deletions(-)
  19.  create mode 100644 src/arch/aarch64.h
  20.  create mode 100644 src/os/linux/aarch64/Makefile.am
  21.  create mode 100644 src/os/linux/aarch64/callNative.S
  22.  create mode 100644 src/os/linux/aarch64/dll_md.c
  23.  create mode 100644 src/os/linux/aarch64/init.c
  25. diff --git a/AUTHORS b/AUTHORS
  26. index e1334fe..6fd0eeb 100644
  27. --- jamvm/jamvm/AUTHORS
  28. +++ jamvm/jamvm/AUTHORS
  29. @@ -1,1 +1,2 @@
  30.  Robert Lougher <rob@jamvm.org.uk>
  31. +Simon South <simon@simonsouth.net>
  32. diff --git a/configure.ac b/configure.ac
  33. index 138b7e6..e7051d7 100644
  34. --- jamvm/jamvm/configure.ac
  35. +++ jamvm/jamvm/configure.ac
  36. @@ -46,6 +46,7 @@ x86_64-*-freebsd*) host_os=bsd libdl_needed=no ;;
  37.  arm*-*-linux*) host_cpu=arm host_os=linux interp_cflags=-marm ;;
  38.  arm*-*-openbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
  39.  arm*-*-freebsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
  40. +aarch64*-*-linux*) host_cpu=aarch64 host_os=linux ;;
  41.  powerpc*-*-linux*) host_cpu=powerpc host_os=linux ;;
  42.  powerpc*-*-openbsd*) host_cpu=powerpc host_os=bsd libdl_needed=no ;;
  43.  powerpc*-*-freebsd*) host_cpu=powerpc host_os=bsd libdl_needed=no ;;
  44. @@ -155,10 +156,11 @@ AC_ARG_ENABLE(runtime-reloc-checks,
  45.  
  46.  AC_ARG_ENABLE(int-inlining,
  47.      [AS_HELP_STRING(--enable-int-inlining,enable inline threaded version of the interpreter
  48. -                   (by default enabled on x86_64, i386, powerpc, mips and arm, 
  49. +                   (by default enabled on x86_64, i386, powerpc, mips, arm and aarch64,
  50.                      disabled otherwise))],,
  51.      [if test "$host_cpu" = x86_64 -o "$host_cpu" = i386 -o "$host_cpu" = x86 -o \
  52. -             "$host_cpu" = powerpc -o "$host_cpu" = arm -o "$host_cpu" = mips; then
  53. +             "$host_cpu" = powerpc -o "$host_cpu" = arm -o "$host_cpu" = mips -o \
  54. +             "$host_cpu" = aarch64; then
  55.           enable_int_inlining=yes
  56.         else
  57.           enable_int_inlining=no
  58. @@ -407,6 +409,7 @@ AC_CONFIG_FILES(
  59.      src/os/linux/x86_64/Makefile \
  60.      src/os/linux/parisc/Makefile \
  61.      src/os/linux/mips/Makefile \
  62. +    src/os/linux/aarch64/Makefile \
  63.      src/os/darwin/i386/Makefile \
  64.      src/os/darwin/arm/Makefile \
  65.      src/os/darwin/powerpc/Makefile \
  66. diff --git a/src/arch/Makefile.am b/src/arch/Makefile.am
  67. index 7580a1b..4e2a4f9 100644
  68. --- jamvm/jamvm/src/arch/Makefile.am
  69. +++ jamvm/jamvm/src/arch/Makefile.am
  70. @@ -19,4 +19,4 @@
  71.  ## Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  72.  ##
  73.  
  74. -EXTRA_DIST = powerpc.h arm.h i386.h x86_64.h parisc.h mips.h sparc.h
  75. +EXTRA_DIST = powerpc.h arm.h i386.h x86_64.h parisc.h mips.h sparc.h aarch64.h
  76. diff --git a/src/arch/aarch64.h b/src/arch/aarch64.h
  77. new file mode 100644
  78. index 0000000..1912e79
  79. --- /dev/null
  80. +++ jamvm/jamvm/src/arch/aarch64.h
  81. @@ -0,0 +1,147 @@
  82. +/*
  83. + * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
  84. + * Robert Lougher <rob@jamvm.org.uk>.
  85. + * Copyright (C) 2020 Simon South <simon@simonsouth.net>.
  86. + *
  87. + * This file is part of JamVM.
  88. + *
  89. + * This program is free software; you can redistribute it and/or
  90. + * modify it under the terms of the GNU General Public License
  91. + * as published by the Free Software Foundation; either version 2,
  92. + * or (at your option) any later version.
  93. + *
  94. + * This program is distributed in the hope that it will be useful,
  95. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  96. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  97. + * GNU General Public License for more details.
  98. + *
  99. + * You should have received a copy of the GNU General Public License
  100. + * along with this program; if not, write to the Free Software
  101. + * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  102. + */
  103. +
  104. +#include <stdint.h>
  105. +
  106. +#define OS_ARCH "aarch64"
  107. +
  108. +#define HANDLER_TABLE_T static const void
  109. +#define DOUBLE_1_BITS 0x3ff0000000000000LL
  110. +
  111. +#define READ_DBL(v,p,l) v = ((u8)p[0]<<56)|((u8)p[1]<<48)|((u8)p[2]<<40) \
  112. +                            |((u8)p[3]<<32)|((u8)p[4]<<24)|((u8)p[5]<<16) \
  113. +                            |((u8)p[6]<<8)|(u8)p[7]; p+=8
  114. +
  115. +/* Needed for i386 -- empty here */
  116. +#define FPU_HACK
  117. +
  118. +#define COMPARE_AND_SWAP_64(addr, old_val, new_val)             \
  119. +({                                                              \
  120. +    int result, read_val;                                       \
  121. +    __asm__ __volatile__ ("                                     \
  122. +        1:      ldaxr %2, %1;                                   \
  123. +                cmp %2, %3;                                     \
  124. +                b.ne 2f;                                        \
  125. +                stlxr %w0, %4, %1;                              \
  126. +                cmp %w0, wzr;                                   \
  127. +                b.ne 1b;                                        \
  128. +        2:      cset %w0, eq;"                                  \
  129. +    : "=&r" (result), "+Q" (*addr), "=&r" (read_val)            \
  130. +    : "r" (old_val), "r" (new_val)                              \
  131. +    : "cc");                                                    \
  132. +    result;                                                     \
  133. +})
  134. +
  135. +#define COMPARE_AND_SWAP_32(addr, old_val, new_val)             \
  136. +({                                                              \
  137. +    int result, read_val;                                       \
  138. +    __asm__ __volatile__ ("                                     \
  139. +        1:      ldaxr %w2, %1;                                  \
  140. +                cmp %w2, %w3;                                   \
  141. +                b.ne 2f;                                        \
  142. +                stlxr %w0, %w4, %1;                             \
  143. +                cmp %w0, wzr;                                   \
  144. +                b.ne 1b;                                        \
  145. +        2:      cset %w0, eq;"                                  \
  146. +    : "=&r" (result), "+Q" (*addr), "=&r" (read_val)            \
  147. +    : "r" (old_val), "r" (new_val)                              \
  148. +    : "cc");                                                    \
  149. +    result;                                                     \
  150. +})
  151. +
  152. +#define COMPARE_AND_SWAP(addr, old_val, new_val)                \
  153. +        COMPARE_AND_SWAP_64(addr, old_val, new_val)
  154. +
  155. +#define LOCKWORD_READ(addr)                                     \
  156. +({                                                              \
  157. +    uintptr_t result;                                           \
  158. +    __asm__ __volatile__ ("                                     \
  159. +                ldar %0, %1;"                                   \
  160. +    : "=r" (result)                                             \
  161. +    : "Q" (*addr)                                               \
  162. +    : "cc");                                                    \
  163. +    result;                                                     \
  164. +})
  165. +
  166. +#define LOCKWORD_WRITE(addr, value)                             \
  167. +({                                                              \
  168. +    __asm__ __volatile__ ("                                     \
  169. +                stlr %1, %0;"                                   \
  170. +    : "=Q" (*addr)                                              \
  171. +    : "r" (value)                                               \
  172. +    : "cc");                                                    \
  173. +})
  174. +
  175. +#define LOCKWORD_COMPARE_AND_SWAP(addr, old_val, new_val)       \
  176. +        COMPARE_AND_SWAP_64(addr, old_val, new_val)
  177. +
  178. +#define FLUSH_CACHE(addr, length)                               \
  179. +{                                                               \
  180. +    uintptr_t start = (uintptr_t) (addr);                       \
  181. +    uintptr_t end = start + length;                             \
  182. +    uintptr_t i;                                                \
  183. +                                                                \
  184. +    for(i = start & aarch64_data_cache_line_mask;               \
  185. +        i < end;                                                \
  186. +        i += aarch64_data_cache_line_len)                       \
  187. +        __asm__ ("dc cvau, %0" :: "r" (i));                     \
  188. +                                                                \
  189. +    __asm__ ("dsb ish");                                        \
  190. +                                                                \
  191. +    for(i = start & aarch64_instruction_cache_line_mask;        \
  192. +        i < end;                                                \
  193. +        i += aarch64_instruction_cache_line_len)                \
  194. +        __asm__ ("ic ivau, %0" :: "r" (i));                     \
  195. +                                                                \
  196. +    __asm__ ("dsb ish; isb");                                   \
  197. +}
  198. +
  199. +#define GEN_REL_JMP(target_addr, patch_addr, patch_size)        \
  200. +({                                                              \
  201. +    int patched = FALSE;                                        \
  202. +                                                                \
  203. +    if(patch_size >= 4) {                                       \
  204. +        /* Guard against the pointer difference being           \
  205. +           larger than the signed range */                      \
  206. +        long long offset = (uintptr_t)(target_addr) -           \
  207. +                           (uintptr_t)(patch_addr);             \
  208. +                                                                \
  209. +        if(offset >= -1<<28 && offset < 1<<28) {                \
  210. +            *(uint32_t*)(patch_addr) = offset>>2 & 0x03ffffff   \
  211. +                                                 | 0x14000000;  \
  212. +            patched = TRUE;                                     \
  213. +        }                                                       \
  214. +    }                                                           \
  215. +    patched;                                                    \
  216. +})
  217. +
  218. +#define MBARRIER() __asm__ ("dmb ish" ::: "memory")
  219. +#define RMBARRIER() __asm__ ("dmb ishld" ::: "memory")
  220. +#define WMBARRIER() __asm__ ("dmb ishst" ::: "memory")
  221. +#define JMM_LOCK_MBARRIER() __asm__ ("dmb ish" ::: "memory")
  222. +#define JMM_UNLOCK_MBARRIER() JMM_LOCK_MBARRIER()
  223. +
  224. +/* Defined in src/os/linux/aarch64/init.c */
  225. +extern unsigned char aarch64_data_cache_line_len;
  226. +extern uintptr_t aarch64_data_cache_line_mask;
  227. +extern unsigned char aarch64_instruction_cache_line_len;
  228. +extern uintptr_t aarch64_instruction_cache_line_mask;
  229. diff --git a/src/jam.c b/src/jam.c
  230. index 052f84a..c97524a 100644
  231. --- jamvm/jamvm/src/jam.c
  232. +++ jamvm/jamvm/src/jam.c
  233. @@ -98,7 +98,8 @@ void showUsage(char *name) {
  234.  void showVersionAndCopyright() {
  235.      printf("java version \"%s\"\n", JAVA_COMPAT_VERSION);
  236.      printf("JamVM version %s\n", VERSION);
  237. -    printf("Copyright (C) 2003-2013 Robert Lougher <rob@jamvm.org.uk>\n\n");
  238. +    printf("Copyright (C) 2003-2013 Robert Lougher <rob@jamvm.org.uk>\n");
  239. +    printf("Portions Copyright (C) 2020 Simon South <simon@simonsouth.net>\n\n");
  240.      printf("This program is free software; you can redistribute it and/or\n");
  241.      printf("modify it under the terms of the GNU General Public License\n");
  242.      printf("as published by the Free Software Foundation; either version 2,\n");
  243. diff --git a/src/os/linux/Makefile.am b/src/os/linux/Makefile.am
  244. index 542094e..83e7dfe 100644
  245. --- jamvm/jamvm/src/os/linux/Makefile.am
  246. +++ jamvm/jamvm/src/os/linux/Makefile.am
  247. @@ -20,7 +20,7 @@
  248.  ##
  249.  
  250.  SUBDIRS = @arch@
  251. -DIST_SUBDIRS = powerpc arm i386 x86_64 parisc mips
  252. +DIST_SUBDIRS = powerpc arm i386 x86_64 parisc mips aarch64
  253.  
  254.  noinst_LTLIBRARIES = libos.la
  255.  libos_la_SOURCES = os.c
  256. diff --git a/src/os/linux/aarch64/Makefile.am b/src/os/linux/aarch64/Makefile.am
  257. new file mode 100644
  258. index 0000000..0e5134f
  259. --- /dev/null
  260. +++ jamvm/jamvm/src/os/linux/aarch64/Makefile.am
  261. @@ -0,0 +1,28 @@
  262. +##
  263. +## Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010, 2011, 2012
  264. +## Robert Lougher <rob@jamvm.org.uk>.
  265. +##
  266. +## File added by Simon South <simon@simonsouth.net>.
  267. +##
  268. +## This file is part of JamVM.
  269. +##
  270. +## This program is free software; you can redistribute it and/or
  271. +## modify it under the terms of the GNU General Public License
  272. +## as published by the Free Software Foundation; either version 2,
  273. +## or (at your option) any later version.
  274. +##
  275. +## This program is distributed in the hope that it will be useful,
  276. +## but WITHOUT ANY WARRANTY; without even the implied warranty of
  277. +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  278. +## GNU General Public License for more details.
  279. +##
  280. +## You should have received a copy of the GNU General Public License
  281. +## along with this program; if not, write to the Free Software
  282. +## Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  283. +##
  284. +
  285. +noinst_LTLIBRARIES = libnative.la
  286. +libnative_la_SOURCES = init.c dll_md.c callNative.S
  287. +
  288. +AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
  289. +AM_CCASFLAGS = -I$(top_builddir)/src
  290. diff --git a/src/os/linux/aarch64/callNative.S b/src/os/linux/aarch64/callNative.S
  291. new file mode 100644
  292. index 0000000..e067c4f
  293. --- /dev/null
  294. +++ jamvm/jamvm/src/os/linux/aarch64/callNative.S
  295. @@ -0,0 +1,212 @@
  296. +/*
  297. + * Copyright (C) 2008, 2009, 2011, 2012 Robert Lougher <rob@jamvm.org.uk>.
  298. + * Copyright (C) 2020 Simon South <simon@simonsouth.net>.
  299. + *
  300. + * This file is part of JamVM.
  301. + *
  302. + * This program is free software; you can redistribute it and/or
  303. + * modify it under the terms of the GNU General Public License
  304. + * as published by the Free Software Foundation; either version 2,
  305. + * or (at your option) any later version.
  306. + *
  307. + * This program is distributed in the hope that it will be useful,
  308. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  309. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  310. + * GNU General Public License for more details.
  311. + *
  312. + * You should have received a copy of the GNU General Public License
  313. + * along with this program; if not, write to the Free Software
  314. + * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  315. + */
  316. +
  317. +#include "config.h"
  318. +
  319. +#ifndef USE_FFI
  320. +        .text
  321. +        .arch armv8-a
  322. +        .align 2
  323. +        .global callJNIMethod
  324. +        .type callJNIMethod,function
  325. +
  326. +/*
  327. + * Arguments passed in:
  328. + *
  329. + * x0 JNIEnv
  330. + * x1 class or NULL
  331. + * x2 sig
  332. + * w3 extra arg
  333. + * x4 ostack
  334. + * x5 function pntr
  335. + * w6 args count
  336. + */
  337. +
  338. +/* Register usage:
  339. + *
  340. + * x20 ostack
  341. + * x19 sig pntr
  342. + * x16 function pntr
  343. + * x15 ostack pntr
  344. + * x14 args pntr
  345. + * x13 float/double handler
  346. + * x12 int/long handler
  347. + * w11 fp regs remaining
  348. + * w10 int regs remaining
  349. + * x9 scratch
  350. + * x2-x7 outgoing int args
  351. + * x1 outgoing class or this pntr
  352. + * x0 outgoing JNIEnv (as passed in)
  353. + *
  354. + * d0 - d7 outgoing float args
  355. + */
  356. +
  357. +callJNIMethod:
  358. +        stp     x29, x30, [sp, #-32]!
  359. +        mov     x29, sp
  360. +        stp     x19, x20, [x29, #16]
  361. +
  362. +        sub     sp, sp, w3              /* allocate room for stacked args */
  363. +        mov     x14, sp
  364. +
  365. +        mov     x20, x4                 /* preserve ostack */
  366. +        add     x19, x2, #1             /* init sig pntr -- skipping '(' */
  367. +
  368. +        mov     x16, x5                 /* save function pntr */
  369. +        mov     x15, x20                /* init ostack pntr */
  370. +
  371. +        adr     x13, fp_reg_handlers-8
  372. +        adr     x12, int_reg_handlers-8
  373. +
  374. +        mov     w11, #8                 /* fp regs remaining */
  375. +        mov     w10, #6                 /* int regs remaining */
  376. +
  377. +        cbnz    x1, scan_sig            /* is method non-static? */
  378. +        ldr     x1, [x15], #8           /* yes, load x1 with "this" */
  379. +
  380. +scan_sig:
  381. +        ldrb    w9, [x19], #1           /* get next sig char */
  382. +
  383. +        cmp     w9, #41                 /* ')' */
  384. +        b.eq    done
  385. +
  386. +        cmp     w9, #74                 /* 'J' */
  387. +        b.eq    long
  388. +
  389. +        cmp     w9, #70                 /* 'F' */
  390. +        b.eq    float
  391. +
  392. +        cmp     w9, #68                 /* 'D' */
  393. +        b.eq    double
  394. +
  395. +skip_brackets:
  396. +        cmp     w9, #91                 /* '[' */
  397. +        b.ne    1f
  398. +        ldrb    w9, [x19], #1
  399. +        b       skip_brackets
  400. +1:
  401. +        cmp     w9, #76                 /* 'L' */
  402. +        b.ne    int
  403. +
  404. +skip_ref:
  405. +        ldrb    w9, [x19], #1
  406. +        cmp     w9, #59                 /* ';' */
  407. +        b.ne    skip_ref
  408. +
  409. +int:
  410. +        ldr     x9, [x15], #8
  411. +        cbz     w10, stack_push
  412. +
  413. +load_int_reg:
  414. +        sub     w10, w10, #1
  415. +        add     x12, x12, #8
  416. +        br      x12
  417. +
  418. +int_reg_handlers:
  419. +        mov     x2, x9
  420. +        b       scan_sig
  421. +        mov     x3, x9
  422. +        b       scan_sig
  423. +        mov     x4, x9
  424. +        b       scan_sig
  425. +        mov     x5, x9
  426. +        b       scan_sig
  427. +        mov     x6, x9
  428. +        b       scan_sig
  429. +        mov     x7, x9
  430. +        b       scan_sig
  431. +
  432. +long:
  433. +        ldr     x9, [x15], #16
  434. +        cbz     w10, stack_push
  435. +        b       load_int_reg
  436. +
  437. +float:
  438. +        ldr     w9, [x15], #8
  439. +        cbz     w11, stack_push
  440. +        b       load_fp_reg
  441. +
  442. +double:
  443. +        ldr     x9, [x15], #16
  444. +        cbz     w11, stack_push
  445. +
  446. +load_fp_reg:
  447. +        sub     w11, w11, #1
  448. +        add     x13, x13, #8
  449. +        br      x13
  450. +
  451. +fp_reg_handlers:
  452. +        fmov    d0, x9
  453. +        b       scan_sig
  454. +        fmov    d1, x9
  455. +        b       scan_sig
  456. +        fmov    d2, x9
  457. +        b       scan_sig
  458. +        fmov    d3, x9
  459. +        b       scan_sig
  460. +        fmov    d4, x9
  461. +        b       scan_sig
  462. +        fmov    d5, x9
  463. +        b       scan_sig
  464. +        fmov    d6, x9
  465. +        b       scan_sig
  466. +        fmov    d7, x9
  467. +        b       scan_sig
  468. +
  469. +stack_push:
  470. +        str     x9, [x14], #8
  471. +        b       scan_sig
  472. +
  473. +done:
  474. +        /* Call the function */
  475. +        blr     x16
  476. +
  477. +        mov     sp, x29                 /* Pop argument area */
  478. +
  479. +        ldrb    w9, [x19]               /* Return type */
  480. +
  481. +        cmp     w9, #86                 /* 'V' */
  482. +        b.eq    return
  483. +
  484. +        cmp     w9, #68                 /* 'D' */
  485. +        b.ne    2f
  486. +        str     d0, [x20], #16
  487. +        b       return
  488. +2:
  489. +        cmp     w9, #70                 /* 'F' */
  490. +        b.ne    3f
  491. +        str     s0, [x20], #8
  492. +        b       return
  493. +3:
  494. +        cmp     w9, #74                 /* 'J' */
  495. +        b.ne    4f
  496. +        str     x0, [x20], #16
  497. +        b       return
  498. +4:
  499. +        str     x0, [x20], #8
  500. +
  501. +return:
  502. +        mov     x0, x20                 /* return ostack */
  503. +
  504. +        ldp     x19, x20, [x29, #16]
  505. +        ldp     x29, x30, [sp], #32
  506. +        ret
  507. +#endif
  508. diff --git a/src/os/linux/aarch64/dll_md.c b/src/os/linux/aarch64/dll_md.c
  509. new file mode 100644
  510. index 0000000..189f8a8
  511. --- /dev/null
  512. +++ jamvm/jamvm/src/os/linux/aarch64/dll_md.c
  513. @@ -0,0 +1,59 @@
  514. +/*
  515. + * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011
  516. + * Robert Lougher <rob@jamvm.org.uk>.
  517. + * Copyright (C) 2020 Simon South <simon@simonsouth.net>.
  518. + *
  519. + * This file is part of JamVM.
  520. + *
  521. + * This program is free software; you can redistribute it and/or
  522. + * modify it under the terms of the GNU General Public License
  523. + * as published by the Free Software Foundation; either version 2,
  524. + * or (at your option) any later version.
  525. + *
  526. + * This program is distributed in the hope that it will be useful,
  527. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  528. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  529. + * GNU General Public License for more details.
  530. + *
  531. + * You should have received a copy of the GNU General Public License
  532. + * along with this program; if not, write to the Free Software
  533. + * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  534. + */
  535. +
  536. +#include "jam.h"
  537. +
  538. +#ifndef USE_FFI
  539. +
  540. +int nativeExtraArg(MethodBlock *mb) {
  541. +    char *sig = mb->type;
  542. +    int stack_args = 0;
  543. +    int int_args = 6;
  544. +    int fp_args = 8;
  545. +
  546. +    while(*++sig != ')')
  547. +        switch(*sig) {
  548. +        case 'F':
  549. +        case 'D':
  550. +            if(fp_args == 0)
  551. +                stack_args += 8;
  552. +            else
  553. +                fp_args--;
  554. +
  555. +        default:
  556. +            if(int_args == 0)
  557. +                stack_args += 8;
  558. +            else
  559. +                int_args--;
  560. +
  561. +            if(*sig == '[')
  562. +                while(*++sig == '[');
  563. +            if(*sig == 'L')
  564. +                while(*++sig != ';');
  565. +            break;
  566. +        }
  567. +
  568. +    /* Ensure the stack remains 16 byte aligned. */
  569. +    return (stack_args + 15) & ~15;
  570. +}
  571. +
  572. +#endif
  573. diff --git a/src/os/linux/aarch64/init.c b/src/os/linux/aarch64/init.c
  574. new file mode 100644
  575. index 0000000..b21dc55
  576. --- /dev/null
  577. +++ jamvm/jamvm/src/os/linux/aarch64/init.c
  578. @@ -0,0 +1,51 @@
  579. +/*
  580. + * Copyright (C) 2003, 2004, 2005, 2006, 2007
  581. + * Robert Lougher <rob@jamvm.org.uk>.
  582. + * Copyright (C) 2020 Simon South <simon@simonsouth.net>.
  583. + *
  584. + * This file is part of JamVM.
  585. + *
  586. + * This program is free software; you can redistribute it and/or
  587. + * modify it under the terms of the GNU General Public License
  588. + * as published by the Free Software Foundation; either version 2,
  589. + * or (at your option) any later version.
  590. + *
  591. + * This program is distributed in the hope that it will be useful,
  592. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  593. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  594. + * GNU General Public License for more details.
  595. + *
  596. + * You should have received a copy of the GNU General Public License
  597. + * along with this program; if not, write to the Free Software
  598. + * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  599. + */
  600. +
  601. +#include "arch/aarch64.h"
  602. +
  603. +/* Length in bytes of the smallest line in the host system's data cache */
  604. +unsigned char aarch64_data_cache_line_len;
  605. +
  606. +/* Mask used to align a virtual address to a line in the data cache */
  607. +uintptr_t aarch64_data_cache_line_mask;
  608. +
  609. +/* Length in bytes of the smallest line in the host system's instruction
  610. +   cache */
  611. +unsigned char aarch64_instruction_cache_line_len;
  612. +
  613. +/* Mask used to align a virtual address to a line in the instruction cache */
  614. +uintptr_t aarch64_instruction_cache_line_mask;
  615. +
  616. +void initialisePlatform() {
  617. +    unsigned int cache_type;
  618. +
  619. +    /* Extract information from the cache-type register, which describes aspects
  620. +       of the host's cache configuration */
  621. +    __asm__ ("mrs %0, ctr_el0" : "=r" (cache_type));
  622. +
  623. +    aarch64_data_cache_line_len = 4 << ((cache_type >> 16) & 0x0f);
  624. +    aarch64_data_cache_line_mask = ~(aarch64_data_cache_line_len - 1);
  625. +
  626. +    aarch64_instruction_cache_line_len = 4 << (cache_type & 0x0f);
  627. +    aarch64_instruction_cache_line_mask =
  628. +        ~(aarch64_instruction_cache_line_len - 1);
  629. +}
  630. -- 
  631. 2.26.2