Changeset d5f4613

Timestamp:

Aug 31, 2020, 11:42:30 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

207c7330

Parents:

42a2970 (diff), 369ffdf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Files:

• libcfa/src/bits/defs.hfa (modified) (3 diffs)
• libcfa/src/concurrency/CtxSwitch-arm64.S (modified) (3 diffs)
• libcfa/src/concurrency/kernel.cfa (modified) (3 diffs)
• libcfa/src/concurrency/preemption.cfa (modified) (2 diffs)
• libcfa/src/exception.c (modified) (5 diffs)
• src/AST/Print.cpp (modified) (2 diffs)
• src/SynTree/Expression.cc (modified) (2 diffs)
• tests/.expect/abs.arm64.txt (added)
• tests/.expect/abs.x64.txt (moved) (moved from tests/.expect/abs.txt)
• tests/.expect/ato.arm64.txt (added)
• tests/.expect/ato.x64.txt (moved) (moved from tests/.expect/ato.txt)
• tests/.expect/manipulatorsOutput1.arm64.txt (added)
• tests/.expect/manipulatorsOutput1.x64.txt (moved) (moved from tests/.expect/manipulatorsOutput1.txt)
• tests/.expect/math1.arm64.txt (added)
• tests/.expect/math1.x64.txt (moved) (moved from tests/.expect/math1.txt)
• tests/.expect/math2.arm64.txt (added)
• tests/.expect/math2.x64.txt (moved) (moved from tests/.expect/math2.txt)
• tests/.expect/math3.arm64.txt (added)
• tests/.expect/math3.x64.txt (moved) (moved from tests/.expect/math3.txt)
• tests/.expect/random.arm64.txt (added)
• tests/.expect/random.x64.txt (moved) (moved from tests/.expect/random.txt)
• tests/literals.cfa (modified) (3 diffs)

libcfa/src/bits/defs.hfa

@@ -10 +10 @@
 // Created On       : Thu Nov  9 13:24:10 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 13 22:00:23 2020
-// Update Count     : 19
+// Last Modified On : Wed Aug 26 16:22:32 2020
+// Update Count     : 20
 //
 
@@ -49 +49 @@
 
 static inline long long int rdtscl(void) {
-        #if defined( __aarch64__ )
+        #if defined( __i386 ) || defined( __x86_64 )
+        unsigned int lo, hi;
+        __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
+        return ( (unsigned long long)lo)|( ((unsigned long long)hi)<<32 );
+        #elif defined( __aarch64__ ) || defined( __arm__ )
         // https://github.com/google/benchmark/blob/v1.1.0/src/cycleclock.h#L116
         long long int virtual_timer_value;
@@ -55 +59 @@
         return virtual_timer_value;
         #else
-        unsigned int lo, hi;
-        __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
-        return ( (unsigned long long)lo)|( ((unsigned long long)hi)<<32 );
+                #error unsupported hardware architecture
         #endif // __ARM_ARCH
 }

libcfa/src/concurrency/CtxSwitch-arm64.S

@@ -2 +2 @@
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 // 
-// CtxSwitch-arm.S -- 
+// CtxSwitch-arm64.S -- 
 // 
 // Author           : Peter A. Buhr
 // Created On       : Sun Aug 16 07:50:13 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 20 18:43:51 2020
-// Update Count     : 24
+// Last Modified On : Wed Aug 26 16:24:59 2020
+// Update Count     : 25
 // 
 
@@ -26 +26 @@
 #define SAVE            20 * 8
 
-        .file "CtxSwitch-arm.S"
+        .file "CtxSwitch-arm64.S"
         .text
         .align 2
         .global __cfactx_switch
-        .type __cfactx_switch, @function
+        .type __cfactx_switch, %function
 __cfactx_switch:
 
@@ -91 +91 @@
         .align 2
         .global __cfactx_invoke_stub
-        .type __cfactx_invoke_stub, @function
+        .type __cfactx_invoke_stub, %function
 __cfactx_invoke_stub:
         mov x0, x19                                                     // load main as parameter 0

libcfa/src/concurrency/kernel.cfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 14 15:23:00 2020
-// Update Count     : 69
+// Last Modified On : Mon Aug 31 07:08:20 2020
+// Update Count     : 71
 //
 
@@ -74 +74 @@
                 )
 
-#elif defined( __ARM_ARCH )
+#elif defined( __arm__ )
+        #define __x87_store
+        #define __x87_load
+
+#elif defined( __aarch64__ )
         #define __x87_store              \
                 uint32_t __fpcntl[2];    \
@@ -93 +97 @@
 
 #else
-        #error unknown hardware architecture
+        #error unsupported hardware architecture
 #endif
 

libcfa/src/concurrency/preemption.cfa

@@ -10 +10 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 21 13:45:32 2020
-// Update Count     : 52
+// Last Modified On : Wed Aug 26 16:46:03 2020
+// Update Count     : 53
 //
 
@@ -56 +56 @@
 #elif defined( __x86_64 )
 #define CFA_REG_IP gregs[REG_RIP]
-#elif defined( __ARM_ARCH )
+#elif defined( __arm__ )
+#define CFA_REG_IP arm_pc
+#elif defined( __aarch64__ )
 #define CFA_REG_IP pc
 #else
-#error unknown hardware architecture
+#error unsupported hardware architecture
 #endif
 

libcfa/src/exception.c

@@ -10 +10 @@
 // Created On       : Mon Jun 26 15:13:00 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 21 11:27:56 2020
-// Update Count     : 29
+// Last Modified On : Sat Aug 29 15:52:22 2020
+// Update Count     : 34
 //
 
@@ -18 +18 @@
 
 #include "exception.h"
-
-// Implementation of the secret header is hardware dependent.
-#if defined( __x86_64 ) || defined( __i386 )
-#elif defined( __ARM_ARCH )
-#warning FIX ME: check if anything needed for ARM
-#else
-#warning Exception Handling: No known architecture detected.
-#endif
 
 #include <stdlib.h>
@@ -34 +26 @@
 #include "stdhdr/assert.h"
 
-// FIX ME: temporary hack to keep ARM build working
+#if defined( __ARM_ARCH )
+#warning FIX ME: temporary hack to keep ARM build working
 #ifndef _URC_FATAL_PHASE1_ERROR
 #define _URC_FATAL_PHASE1_ERROR 3
@@ -41 +34 @@
 #define _URC_FATAL_PHASE2_ERROR 2
 #endif // ! _URC_FATAL_PHASE2_ERROR
+#endif // __ARM_ARCH
 
 #include "lsda.h"
@@ -626 +620 @@
 
 #pragma GCC pop_options
+
+#elif defined( __ARM_ARCH )
+_Unwind_Reason_Code __gcfa_personality_v0(
+                int version,
+                _Unwind_Action actions,
+                unsigned long long exception_class,
+                struct _Unwind_Exception * unwind_exception,
+                struct _Unwind_Context * unwind_context) {
+        return _URC_CONTINUE_UNWIND;
+}
+
+__attribute__((noinline))
+void __cfaehm_try_terminate(void (*try_block)(),
+                void (*catch_block)(int index, exception_t * except),
+                __attribute__((unused)) int (*match_block)(exception_t * except)) {
+}
+#else
+        #error unsupported hardware architecture
 #endif // __x86_64 || __i386

src/AST/Print.cpp

@@ -21 +21 @@
 #include "Type.hpp"
 #include "TypeSubstitution.hpp"
+#include "CompilationState.h"
 
 #include "Common/utility.h" // for group_iterate
@@ -239 +240 @@
 
                 if ( node->result ) {
-                        os << endl << indent << "... with resolved type:" << endl;
-                        ++indent;
-                        os << indent;
-                        node->result->accept( *this );
-                        --indent;
+                        if (!deterministic_output) {
+                                os << endl << indent << "... with resolved type:" << endl;
+                                ++indent;
+                                os << indent;
+                                node->result->accept( *this );
+                                --indent;
+                        }
                 }
 

src/SynTree/Expression.cc

@@ -30 +30 @@
 #include "Type.h"                    // for Type, BasicType, Type::Qualifiers
 #include "TypeSubstitution.h"        // for TypeSubstitution
+#include "CompilationState.h"        // for deterministic_output
 
 #include "GenPoly/Lvalue.h"
@@ -71 +72 @@
 
         if ( result ) {
-                os << std::endl << indent << "with resolved type:" << std::endl;
-                os << (indent+1);
-                result->print( os, indent+1 );
+                if (!deterministic_output) {
+                        os << std::endl << indent << "with resolved type:" << std::endl;
+                        os << (indent+1);
+                        result->print( os, indent+1 );
+                }
         }
 

tests/literals.cfa

@@ -10 +10 @@
 // Created On       : Sat Sep  9 16:34:38 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 20 13:51:12 2020
-// Update Count     : 225
+// Last Modified On : Sat Aug 29 10:57:56 2020
+// Update Count     : 226
 //
 
@@ -151 +151 @@
         -0X0123456789.0123456789P-09;  -0X0123456789.0123456789P-09f;  -0X0123456789.0123456789P-09l;  -0X0123456789.0123456789P-09F;  -0X0123456789.0123456789P-09L;
 
+#if defined( __i386 ) || defined( __x86_64 )
 #if defined(__GNUC__) && __GNUC_PREREQ(7,0)                             // gcc version >= 7
 // floating with length, gcc f16/f128x unsupported and no prelude code for any _FloatXXx, so they work by conversion to long double
@@ -194 +195 @@
         /* -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; */
 #endif // __GNUC_PREREQ(7,0)
+#endif // __i386 ) || __x86_64
 
 #ifdef __CFA__