Changes in / [d5f4613:42a2970]


Ignore:
Files:
7 added
14 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • libcfa/src/bits/defs.hfa

    rd5f4613 r42a2970  
    1010// Created On       : Thu Nov  9 13:24:10 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Aug 26 16:22:32 2020
    13 // Update Count     : 20
     12// Last Modified On : Thu Aug 13 22:00:23 2020
     13// Update Count     : 19
    1414//
    1515
    … …  
    4949
    5050static inline long long int rdtscl(void) {
    51         #if defined( __i386 ) || defined( __x86_64 )
    52         unsigned int lo, hi;
    53         __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
    54         return ( (unsigned long long)lo)|( ((unsigned long long)hi)<<32 );
    55         #elif defined( __aarch64__ ) || defined( __arm__ )
     51        #if defined( __aarch64__ )
    5652        // https://github.com/google/benchmark/blob/v1.1.0/src/cycleclock.h#L116
    5753        long long int virtual_timer_value;
    … …  
    5955        return virtual_timer_value;
    6056        #else
    61                 #error unsupported hardware architecture
     57        unsigned int lo, hi;
     58        __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
     59        return ( (unsigned long long)lo)|( ((unsigned long long)hi)<<32 );
    6260        #endif // __ARM_ARCH
    6361}

  • libcfa/src/concurrency/CtxSwitch-arm64.S

    rd5f4613 r42a2970  
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    4 // CtxSwitch-arm64.S --
     4// CtxSwitch-arm.S --
    55//
    66// Author           : Peter A. Buhr
    77// Created On       : Sun Aug 16 07:50:13 2020
    88// Last Modified By : Peter A. Buhr
    9 // Last Modified On : Wed Aug 26 16:24:59 2020
    10 // Update Count     : 25
     9// Last Modified On : Thu Aug 20 18:43:51 2020
     10// Update Count     : 24
    1111//
    1212
    … …  
    2626#define SAVE            20 * 8
    2727
    28         .file "CtxSwitch-arm64.S"
     28        .file "CtxSwitch-arm.S"
    2929        .text
    3030        .align 2
    3131        .global __cfactx_switch
    32         .type __cfactx_switch, %function
     32        .type __cfactx_switch, @function
    3333__cfactx_switch:
    3434
    … …  
    9191        .align 2
    9292        .global __cfactx_invoke_stub
    93         .type __cfactx_invoke_stub, %function
     93        .type __cfactx_invoke_stub, @function
    9494__cfactx_invoke_stub:
    9595        mov x0, x19                                                     // load main as parameter 0

  • libcfa/src/concurrency/kernel.cfa

    rd5f4613 r42a2970  
    1010// Created On       : Tue Jan 17 12:27:26 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon Aug 31 07:08:20 2020
    13 // Update Count     : 71
     12// Last Modified On : Fri Aug 14 15:23:00 2020
     13// Update Count     : 69
    1414//
    1515
    … …  
    7474                )
    7575
    76 #elif defined( __arm__ )
    77         #define __x87_store
    78         #define __x87_load
    79 
    80 #elif defined( __aarch64__ )
     76#elif defined( __ARM_ARCH )
    8177        #define __x87_store              \
    8278                uint32_t __fpcntl[2];    \
    … …  
    9793
    9894#else
    99         #error unsupported hardware architecture
     95        #error unknown hardware architecture
    10096#endif
    10197

  • libcfa/src/concurrency/preemption.cfa

    rd5f4613 r42a2970  
    1010// Created On       : Mon Jun 5 14:20:42 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Aug 26 16:46:03 2020
    13 // Update Count     : 53
     12// Last Modified On : Fri Aug 21 13:45:32 2020
     13// Update Count     : 52
    1414//
    1515
    … …  
    5656#elif defined( __x86_64 )
    5757#define CFA_REG_IP gregs[REG_RIP]
    58 #elif defined( __arm__ )
    59 #define CFA_REG_IP arm_pc
    60 #elif defined( __aarch64__ )
     58#elif defined( __ARM_ARCH )
    6159#define CFA_REG_IP pc
    6260#else
    63 #error unsupported hardware architecture
     61#error unknown hardware architecture
    6462#endif
    6563

  • libcfa/src/exception.c

    rd5f4613 r42a2970  
    1010// Created On       : Mon Jun 26 15:13:00 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sat Aug 29 15:52:22 2020
    13 // Update Count     : 34
     12// Last Modified On : Fri Aug 21 11:27:56 2020
     13// Update Count     : 29
    1414//
    1515
    … …  
    1818
    1919#include "exception.h"
     20
     21// Implementation of the secret header is hardware dependent.
     22#if defined( __x86_64 ) || defined( __i386 )
     23#elif defined( __ARM_ARCH )
     24#warning FIX ME: check if anything needed for ARM
     25#else
     26#warning Exception Handling: No known architecture detected.
     27#endif
    2028
    2129#include <stdlib.h>
    … …  
    2634#include "stdhdr/assert.h"
    2735
    28 #if defined( __ARM_ARCH )
    29 #warning FIX ME: temporary hack to keep ARM build working
     36// FIX ME: temporary hack to keep ARM build working
    3037#ifndef _URC_FATAL_PHASE1_ERROR
    3138#define _URC_FATAL_PHASE1_ERROR 3
    … …  
    3441#define _URC_FATAL_PHASE2_ERROR 2
    3542#endif // ! _URC_FATAL_PHASE2_ERROR
    36 #endif // __ARM_ARCH
    3743
    3844#include "lsda.h"
    … …  
    620626
    621627#pragma GCC pop_options
    622 
    623 #elif defined( __ARM_ARCH )
    624 _Unwind_Reason_Code __gcfa_personality_v0(
    625                 int version,
    626                 _Unwind_Action actions,
    627                 unsigned long long exception_class,
    628                 struct _Unwind_Exception * unwind_exception,
    629                 struct _Unwind_Context * unwind_context) {
    630         return _URC_CONTINUE_UNWIND;
    631 }
    632 
    633 __attribute__((noinline))
    634 void __cfaehm_try_terminate(void (*try_block)(),
    635                 void (*catch_block)(int index, exception_t * except),
    636                 __attribute__((unused)) int (*match_block)(exception_t * except)) {
    637 }
    638 #else
    639         #error unsupported hardware architecture
    640628#endif // __x86_64 || __i386

  • src/AST/Print.cpp

    rd5f4613 r42a2970  
    2121#include "Type.hpp"
    2222#include "TypeSubstitution.hpp"
    23 #include "CompilationState.h"
    2423
    2524#include "Common/utility.h" // for group_iterate
    … …  
    240239
    241240                if ( node->result ) {
    242                         if (!deterministic_output) {
    243                                 os << endl << indent << "... with resolved type:" << endl;
    244                                 ++indent;
    245                                 os << indent;
    246                                 node->result->accept( *this );
    247                                 --indent;
    248                         }
     241                        os << endl << indent << "... with resolved type:" << endl;
     242                        ++indent;
     243                        os << indent;
     244                        node->result->accept( *this );
     245                        --indent;
    249246                }
    250247

  • src/SynTree/Expression.cc

    rd5f4613 r42a2970  
    3030#include "Type.h"                    // for Type, BasicType, Type::Qualifiers
    3131#include "TypeSubstitution.h"        // for TypeSubstitution
    32 #include "CompilationState.h"        // for deterministic_output
    3332
    3433#include "GenPoly/Lvalue.h"
    … …  
    7271
    7372        if ( result ) {
    74                 if (!deterministic_output) {
    75                         os << std::endl << indent << "with resolved type:" << std::endl;
    76                         os << (indent+1);
    77                         result->print( os, indent+1 );
    78                 }
     73                os << std::endl << indent << "with resolved type:" << std::endl;
     74                os << (indent+1);
     75                result->print( os, indent+1 );
    7976        }
    8077

  • tests/literals.cfa

    rd5f4613 r42a2970  
    1010// Created On       : Sat Sep  9 16:34:38 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sat Aug 29 10:57:56 2020
    13 // Update Count     : 226
     12// Last Modified On : Thu Aug 20 13:51:12 2020
     13// Update Count     : 225
    1414//
    1515
    … …  
    151151        -0X0123456789.0123456789P-09;  -0X0123456789.0123456789P-09f;  -0X0123456789.0123456789P-09l;  -0X0123456789.0123456789P-09F;  -0X0123456789.0123456789P-09L;
    152152
    153 #if defined( __i386 ) || defined( __x86_64 )
    154153#if defined(__GNUC__) && __GNUC_PREREQ(7,0)                             // gcc version >= 7
    155154// floating with length, gcc f16/f128x unsupported and no prelude code for any _FloatXXx, so they work by conversion to long double
    … …  
    195194        /* -0x123456789.0123456789P-09F16; */  -0x123456789.0123456789P-09F32;  -0x123456789.0123456789P-09F32x;  -0x123456789.0123456789P-09F64;  -0x123456789.0123456789P-09F64x;  -0x123456789.0123456789P-09W;  -0x123456789.0123456789P-09F128;  -0x123456789.0123456789P-09q;  /* -0x123456789.0123456789P-09q; */
    196195#endif // __GNUC_PREREQ(7,0)
    197 #endif // __i386 ) || __x86_64
    198196
    199197#ifdef __CFA__
Note: See TracChangeset for help on using the changeset viewer.