Changeset 3823


Ignore:
Timestamp:
Apr 13, 2014, 10:27:48 PM (4 years ago)
Author:
ksherdy
Message:

Minor updates.

Location:
proto/s2k/trunk/framework/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • proto/s2k/trunk/framework/src/application/generators/ApplicationGenerator.java

    r3814 r3823  
    99package application.generators;
    1010
    11 import toolchain.b2k.codeGenerator.idisa.IDISABuiltin2C;
    12 import toolchain.b2k.codeGenerator.idisa.IDISABuiltin2CPP;
     11import toolchain.b2k.lang.idisa.IDISABuiltins2C;
     12import toolchain.b2k.lang.idisa.IDISABuiltins2CPP;
    1313import toolchain.b2k.codeGenerator.visitors.AbstractCodeGenerator;
    1414import toolchain.b2k.codeGenerator.visitors.CodeGenerator;
     
    4040               
    4141                // Transformation configurations to support multiple backends
    42                 toolchain.s2k.lang.S2KBuiltinEncoder s2kBuiltinsEncoder  = null;
    43                 toolchain.b2k.lang.AbstractBuiltinEncoder b2kBuiltinsEncoder  = null;
    44                 AbstractCodeGenerator globalDefsGenerator                                                                       = null;
     42                //toolchain.s2k.lang.AbstractS2KBuiltinEncoder s2kBuiltinsEncoder       = null;
     43                toolchain.b2k.lang.AbstractB2KBuiltinsEncoder b2kBuiltinsEncoder        = null;
     44                AbstractCodeGenerator globalDefsGenerator                                                       = null;
    4545               
    46                 toolchain.s2k.lang.carrySet.CarrySetEncoder carrySetEncoder = null;
     46                toolchain.b2k.lang.carrySet.CarrySetEncoder carrySetEncoder = null;
    4747                               
    4848                if(applicationConfiguration.getTarget() == Target.C_LANG) {
    49             s2kBuiltinsEncoder  = new toolchain.s2k.lang.S2KBuiltin2C();
     49            //s2kBuiltinsEncoder        = new toolchain.s2k.lang.S2KBuiltin2C();
    5050            b2kBuiltinsEncoder  = new toolchain.b2k.lang.B2KBuiltins2C();
    51             carrySetEncoder     = new toolchain.s2k.lang.carrySet.CarrySetBuiltin2C();
    52                         globalDefsGenerator = new CodeGenerator(new IDISABuiltin2C(), b2kBuiltinsEncoder);                     
     51            carrySetEncoder     = new toolchain.b2k.lang.carrySet.CarrySetBuiltins2C();
     52                        globalDefsGenerator = new CodeGenerator(new IDISABuiltins2C(), b2kBuiltinsEncoder);                     
    5353                } else if(applicationConfiguration.getTarget() == Target.CPP_LANG) {
    54                         s2kBuiltinsEncoder      = new toolchain.s2k.lang.S2KBuiltin2CPP();
     54                        //s2kBuiltinsEncoder    = new toolchain.s2k.lang.S2KBuiltin2CPP();
    5555                        b2kBuiltinsEncoder      = new toolchain.b2k.lang.B2KBuiltins2CPP();
    56                         carrySetEncoder         = new toolchain.s2k.lang.carrySet.CarrySetBuiltin2CPP();
    57                         globalDefsGenerator     = new CodeGenerator(new IDISABuiltin2CPP(), b2kBuiltinsEncoder);
     56                        carrySetEncoder         = new toolchain.b2k.lang.carrySet.CarrySetBuiltins2CPP();
     57                        globalDefsGenerator     = new CodeGenerator(new IDISABuiltins2CPP(), b2kBuiltinsEncoder);
    5858                } /*else if(applicationConfiguration.targetLang.contentEquals(Configuration.LLVM)) {  // default C++
    5959                        builtins2Lang = new S2KBuiltins2CPP();
     
    7676            //////////////////////////////////////////////////////////////
    7777            // s2k to b2k transformations
    78                         b2kAST = S2K2B2KTransformer.apply(s2kBuiltinsEncoder, carrySetEncoder, decoratedTree, finalBlockDecoratedTree);
     78                        b2kAST = S2K2B2KTransformer.apply(b2kBuiltinsEncoder, carrySetEncoder, decoratedTree, finalBlockDecoratedTree);
    7979                       
    8080                } else if (applicationConfiguration.getSource() == SourceLanguage.B2K) {
     
    9696        } 
    9797
    98         b2kAST = B2K2B2KController.accept(b2kAST);
    99        
     98        b2kAST = B2K2B2KController.accept(b2kAST,  b2kBuiltinsEncoder);
    10099       
    101100                // Set up file paths
  • proto/s2k/trunk/framework/src/test/s2k/TestHarness.java

    r3814 r3823  
    2424import test.helpers.FileUtil;
    2525import test.helpers.AssertNodePairComparator;
    26 import toolchain.s2k.lang.S2KBuiltin2CPP;
    27 import toolchain.s2k.lang.S2KBuiltinEncoder;
    28 import toolchain.s2k.lang.carrySet.CarrySetBuiltin2CPP;
    29 import toolchain.s2k.lang.carrySet.CarrySetEncoder;
     26import toolchain.b2k.lang.carrySet.CarrySetBuiltins2CPP;
     27import toolchain.b2k.lang.carrySet.CarrySetEncoder;
     28import toolchain.s2k.lang.AbstractS2KBuiltinsEncoder;
    3029import toolchain.s2k.transformer.visitors.S2K2B2K.Context;
    3130import toolchain.s2k.transformer.visitors.S2K2S2K.CombineAdvances;
Note: See TracChangeset for help on using the changeset viewer.