Changeset 0d92e5c


Ignore:
Timestamp:
Jul 31, 2019, 3:34:45 PM (2 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
df8b87c, f9bf142
Parents:
c6f1f3e (diff), 61cfae2 (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:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • automake/cfa.m4

    rc6f1f3e r0d92e5c  
    6666                "x86-64"     ) cannon_arch_name="x64";;
    6767                "x86_64"     ) cannon_arch_name="x64";;
     68                "aarch64"    ) cannon_arch_name="x64";;
    6869                "x86"        ) cannon_arch_name="x86";;
    6970                "i386"       ) cannon_arch_name="x86";;
     
    7576                "armv7l"     ) cannon_arch_name="arm";;
    7677                *)
    77                 >&2 echo "Unkown architecture " $arch_name;
     78                >&2 echo "Unknown architecture " $arch_name;
    7879                exit 1
    7980                ;;
  • benchmark/Makefile.am

    rc6f1f3e r0d92e5c  
    1111## Created On       : Sun May 31 09:08:15 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Mon Jun 24 16:45:42 2019
    14 ## Update Count     : 53
     13## Last Modified On : Mon Jul 29 18:02:19 2019
     14## Update Count     : 54
    1515###############################################################################
    1616
     
    5050REPEAT   = ${abs_top_builddir}/tools/repeat
    5151STATS    = ${abs_top_srcdir}/tools/stat.py
    52 repeats  = 3 # 30
     52# NEED AT LEAST 4 DATA VALUES FOR BENCHMARKS BECAUSE THE MAX AND MIN VALUES ARE REMOVED
     53repeats  = 5 # 31 for benchmarks
    5354arch     = x64
    5455skipcompile = no
  • benchmark/Makefile.in

    rc6f1f3e r0d92e5c  
    396396REPEAT = ${abs_top_builddir}/tools/repeat
    397397STATS = ${abs_top_srcdir}/tools/stat.py
    398 repeats = 3 # 30
     398# NEED AT LEAST 4 DATA VALUES FOR BENCHMARKS BECAUSE THE MAX AND MIN VALUES ARE REMOVED
     399repeats = 5 # 31 for benchmarks
    399400arch = x64
    400401skipcompile = no
  • configure

    rc6f1f3e r0d92e5c  
    34333433                "x86-64"     ) cannon_arch_name="x64";;
    34343434                "x86_64"     ) cannon_arch_name="x64";;
     3435                "aarch64"    ) cannon_arch_name="x64";;
    34353436                "x86"        ) cannon_arch_name="x86";;
    34363437                "i386"       ) cannon_arch_name="x86";;
     
    34423443                "armv7l"     ) cannon_arch_name="arm";;
    34433444                *)
    3444                 >&2 echo "Unkown architecture " $arch_name;
     3445                >&2 echo "Unknown architecture " $arch_name;
    34453446                exit 1
    34463447                ;;
     
    34743475                "x86-64"     ) cannon_arch_name="x64";;
    34753476                "x86_64"     ) cannon_arch_name="x64";;
     3477                "aarch64"    ) cannon_arch_name="x64";;
    34763478                "x86"        ) cannon_arch_name="x86";;
    34773479                "i386"       ) cannon_arch_name="x86";;
     
    34833485                "armv7l"     ) cannon_arch_name="arm";;
    34843486                *)
    3485                 >&2 echo "Unkown architecture " $arch_name;
     3487                >&2 echo "Unknown architecture " $arch_name;
    34863488                exit 1
    34873489                ;;
  • src/SymTab/Demangle.cc

    rc6f1f3e r0d92e5c  
    99// Author           : Rob Schluntz
    1010// Created On       : Thu Jul 19 12:52:41 2018
    11 // Last Modified By : Rob Schluntz
    12 // Last Modified On : Thu Jul 19 12:54:35 2018
    13 // Update Count     : 2
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Tue Jul 30 13:46:33 2019
     13// Update Count     : 3
    1414//
    1515
     
    313313                        typeString = "_Atomic " + typeString;
    314314                } // if
    315                 if ( type->get_lvalue() ) {
    316                         // when not generating C code, print lvalue for debugging.
    317                         typeString = "lvalue " + typeString;
    318                 }
    319315        }
    320316}
  • src/SymTab/Mangler.cc

    rc6f1f3e r0d92e5c  
    1010// Created On       : Sun May 17 21:40:29 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon Sep 25 15:49:26 2017
    13 // Update Count     : 23
     12// Last Modified On : Tue Jul 30 13:46:10 2019
     13// Update Count     : 26
    1414//
    1515#include "Mangler.h"
     
    377377                                        mangleName << Encoding::qualifiers.at(Type::Mutex);
    378378                                } // if
    379                                 if ( type->get_lvalue() ) {
    380                                         // mangle based on whether the type is lvalue, so that the resolver can differentiate lvalues and rvalues
    381                                         mangleName << Encoding::qualifiers.at(Type::Lvalue);
    382                                 }
    383 
    384379                                if ( inFunctionType ) {
    385380                                        // turn off inFunctionType so that types can be differentiated for nested qualifiers
     
    724719                                mangleName << Encoding::qualifiers.at(Type::Mutex);
    725720                        } // if
    726                         if ( type->is_lvalue() ) {
    727                                 // mangle based on whether the type is lvalue, so that the resolver can differentiate lvalues and rvalues
    728                                 mangleName << Encoding::qualifiers.at(Type::Lvalue);
    729                         }
    730 
    731721                        if ( inFunctionType ) {
    732722                                // turn off inFunctionType so that types can be differentiated for nested qualifiers
  • tests/pybin/settings.py

    rc6f1f3e r0d92e5c  
    2222                'x86-64'                : 'x64',
    2323                'x86_64'                : 'x64',
     24                'aarch64'               : 'x64',
    2425                'x86'                   : 'x86',
    2526                'i386'          : 'x86',
     
    4041                        canonical_host = Architecture.make_canonical( config.HOSTARCH )
    4142                except KeyError:
    42                         print("Unkown host architecture %s" % config.HOSTARCH, file=sys.stderr)
     43                        print("Unknown host architecture %s" % config.HOSTARCH, file=sys.stderr)
    4344                        sys.exit(1)
    4445
     
    4748                                arch = Architecture.make_canonical( arch )
    4849                        except KeyError:
    49                                 print("Unkown architecture %s" % arch, file=sys.stderr)
     50                                print("Unknown architecture %s" % arch, file=sys.stderr)
    5051                                sys.exit(1)
    5152
Note: See TracChangeset for help on using the changeset viewer.