From: Gabe Black Date: Wed, 25 Mar 2020 01:37:49 +0000 (-0700) Subject: util: Move m5op_arm_A64.S into an aarch64 subdirectory. X-Git-Tag: v20.0.0.0~204 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=351790353a8ff01a3fb559327dd49d357c9bad12;p=gem5.git util: Move m5op_arm_A64.S into an aarch64 subdirectory. Also rename it to m5op.S. These files will be distinguished by what directory they're in, rather than by their name. Change-Id: I3a89d529bb5b760579df22234cf9bf870711b56e Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27216 Reviewed-by: Giacomo Travaglini Maintainer: Giacomo Travaglini Tested-by: kokoro --- diff --git a/util/m5/src/SConscript b/util/m5/src/SConscript index 464da64c5..752084199 100644 --- a/util/m5/src/SConscript +++ b/util/m5/src/SConscript @@ -29,7 +29,7 @@ Import('*') # Raw source files. m5_mmap = 'm5_mmap.c' -m5op = 'm5op_arm_A64.S' +m5op = 'aarch64/m5op.S' m5 = 'm5.c' jni = 'jni_gem5Op.c' lua = 'lua_gem5Op.c' diff --git a/util/m5/src/aarch64/m5op.S b/util/m5/src/aarch64/m5op.S new file mode 100644 index 000000000..6f9f03808 --- /dev/null +++ b/util/m5/src/aarch64/m5op.S @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2010-2013, 2016-2017 ARM Limited + * All rights reserved + * + * The license below extends only to copyright in the software and shall + * not be construed as granting a license to any other intellectual + * property including but not limited to intellectual property relating + * to a hardware implementation of the functionality of the software + * licensed hereunder. You may use the software subject to the license + * terms below provided that you ensure that this notice is replicated + * unmodified and in its entirety in all distributions of the software, + * modified or unmodified, in source code or in binary form. + * + * Copyright (c) 2003-2006 The Regents of The University of Michigan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include + +#ifdef M5OP_ADDR +.macro m5op_func, name, func + .globl \name + \name: + // Load the value of m5_mem into x9... +#if defined(M5OP_PIC) + // using the global offset table. + adrp x9, :got:m5_mem + ldr x9, [ x9, #:got_lo12:m5_mem ] + ldr x9, [ x9 ] +#else + // normally. + adrp x9, m5_mem + ldr x9, [ x9, #:lo12:m5_mem ] +#endif + movz x10, #(\func << 8) + ldr x0, [ x9, x10 ] + ret +.endm +#else +.macro m5op_func, name, func + .globl \name + \name: + .long 0xff000110 | (\func << 16) + ret +.endm +#endif + +.text +#define M5OP(name, func) m5op_func name, func + M5OP_FOREACH +#undef M5OP diff --git a/util/m5/src/m5op_arm_A64.S b/util/m5/src/m5op_arm_A64.S deleted file mode 100644 index 6f9f03808..000000000 --- a/util/m5/src/m5op_arm_A64.S +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2010-2013, 2016-2017 ARM Limited - * All rights reserved - * - * The license below extends only to copyright in the software and shall - * not be construed as granting a license to any other intellectual - * property including but not limited to intellectual property relating - * to a hardware implementation of the functionality of the software - * licensed hereunder. You may use the software subject to the license - * terms below provided that you ensure that this notice is replicated - * unmodified and in its entirety in all distributions of the software, - * modified or unmodified, in source code or in binary form. - * - * Copyright (c) 2003-2006 The Regents of The University of Michigan - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer; - * redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution; - * neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include - -#ifdef M5OP_ADDR -.macro m5op_func, name, func - .globl \name - \name: - // Load the value of m5_mem into x9... -#if defined(M5OP_PIC) - // using the global offset table. - adrp x9, :got:m5_mem - ldr x9, [ x9, #:got_lo12:m5_mem ] - ldr x9, [ x9 ] -#else - // normally. - adrp x9, m5_mem - ldr x9, [ x9, #:lo12:m5_mem ] -#endif - movz x10, #(\func << 8) - ldr x0, [ x9, x10 ] - ret -.endm -#else -.macro m5op_func, name, func - .globl \name - \name: - .long 0xff000110 | (\func << 16) - ret -.endm -#endif - -.text -#define M5OP(name, func) m5op_func name, func - M5OP_FOREACH -#undef M5OP