Changeset 4024


Ignore:
Timestamp:
Aug 16, 2014, 6:56:52 PM (4 years ago)
Author:
ksherdy
Message:

Restructured top-level.

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

Legend:

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

    r3832 r4024  
    99package application.generators;
    1010
    11 import toolchain.b2k.lang.idisa.IDISABuiltins2C;
    12 import toolchain.b2k.lang.idisa.IDISABuiltins2CPP;
     11import toolchain.b2k.lang.paramBuiltin.idisa.IDISABuiltins2C;
     12import toolchain.b2k.lang.paramBuiltin.idisa.IDISABuiltins2CPP;
    1313import toolchain.b2k.codeGenerator.visitors.AbstractCodeGenerator;
    1414import toolchain.b2k.codeGenerator.visitors.CodeGenerator;
     
    4141                // Transformation configurations to support multiple backends
    4242                //toolchain.s2k.lang.AbstractS2KBuiltinEncoder s2kBuiltinsEncoder       = null;
    43                 toolchain.b2k.lang.AbstractB2KBuiltinsEncoder b2kBuiltinsEncoder        = null;
     43                toolchain.b2k.lang.builtin.AbstractB2KBuiltinsEncoder b2kBuiltinsEncoder        = null;
    4444                AbstractCodeGenerator globalDefsGenerator                                                       = null;
    4545               
     
    4848                if(applicationConfiguration.getTarget() == Target.C_LANG) {
    4949            //s2kBuiltinsEncoder        = new toolchain.s2k.lang.S2KBuiltin2C();
    50             b2kBuiltinsEncoder  = new toolchain.b2k.lang.B2KBuiltins2C();
     50            b2kBuiltinsEncoder  = new toolchain.b2k.lang.builtin.B2KBuiltins2C();
    5151            runtimeInfoSetEncoder       = new toolchain.b2k.lang.runtimeInfoSet.RuntimeInfoSetBuiltins2C();
    5252                        globalDefsGenerator = new CodeGenerator(new IDISABuiltins2C(), b2kBuiltinsEncoder);                     
    5353                } else if(applicationConfiguration.getTarget() == Target.CPP_LANG) {
    5454                        //s2kBuiltinsEncoder    = new toolchain.s2k.lang.S2KBuiltin2CPP();
    55                         b2kBuiltinsEncoder      = new toolchain.b2k.lang.B2KBuiltins2CPP();
     55                        b2kBuiltinsEncoder      = new toolchain.b2k.lang.builtin.B2KBuiltins2CPP();
    5656                        runtimeInfoSetEncoder   = new toolchain.b2k.lang.runtimeInfoSet.RuntimeInfoSetBuiltins2CPP();
    5757                        globalDefsGenerator     = new CodeGenerator(new IDISABuiltins2CPP(), b2kBuiltinsEncoder);
  • proto/s2k/trunk/framework/src/application/generators/ContentsGenerator.java

    r3797 r4024  
    5757                       
    5858                        String kernelDefinitions = makeKernelDeclarations();
    59                         template.set("kernel_decls", kernelDefinitions);
     59                        template.set("filter_decls", kernelDefinitions);
    6060                       
    6161                        String kernelDoBlockStmts = makeKernelDoBlockStmts();
    62                         template.set("kernel_do_block", kernelDoBlockStmts);
     62                        template.set("filter_do_block", kernelDoBlockStmts);
    6363                       
    6464                        String kernelDoFinalBlockStmts = makeKernelDoFinalBlockStmts();
    65                         template.set("kernel_do_final_block", kernelDoFinalBlockStmts);
     65                        template.set("filter_do_final_block", kernelDoFinalBlockStmts);
    6666                       
    6767                        String kernelClearStmts = makeKernelClearStmts();
    68                         template.set("kernel_clear", kernelClearStmts);
     68                        template.set("filter_clear", kernelClearStmts);
    6969                }
    7070               
  • proto/s2k/trunk/framework/src/application/templating/MemoryTemplate.java

    r3699 r4024  
    122122        private void missingValueError(String Var) {
    123123                //logError("Template error: Var " + Var + " missing value in template " + name + ".");
    124             System.err.println("Template error: Var " + Var + " missing value in template " + name + ".");
     124            System.err.println("Template error: " + Var + " missing value in template " + name + ".");
    125125        }
    126126//      private void logError(String message) {
  • proto/s2k/trunk/framework/src/test/s2k/TestHarness.java

    r3832 r4024  
    2626import toolchain.b2k.lang.runtimeInfoSet.RuntimeInfoSetBuiltins2CPP;
    2727import toolchain.b2k.lang.runtimeInfoSet.RuntimeInfoSetEncoder;
    28 import toolchain.s2k.lang.AbstractS2KBuiltinsEncoder;
    2928import toolchain.s2k.transformer.visitors.S2K2B2K.Context;
    3029import toolchain.s2k.transformer.visitors.S2K2S2K.CombineAdvances;
  • proto/s2k/trunk/framework/src/toolchain/b2k/ast/Generators.java

    r3831 r4024  
    1212
    1313import toolchain.b2k.ast.Accessors;
    14 
    15 import toolchain.b2k.lang.B2KBuiltins;
     14import toolchain.b2k.lang.paramBuiltin.idisa.IDISABuiltin;
    1615import toolchain.b2k.lang.runtimeInfoSet.RuntimeInfoSetBuiltins;
    17 import toolchain.b2k.lang.idisa.IDISABuiltin;
     16import toolchain.b2k.lang.builtin.B2KBuiltins;
    1817import toolchain.s2k.transformer.visitors.S2K2B2K.Context;
    1918
    20 import static toolchain.b2k.lang.B2KBuiltins.*;
    21 import static toolchain.b2k.lang.idisa.IDISABuiltin.*;
     19import static toolchain.b2k.lang.builtin.B2KBuiltins.*;
     20import static toolchain.b2k.lang.paramBuiltin.idisa.IDISABuiltin.*;
    2221import static toolchain.b2k.lang.type.PrimitiveType.BITBLOCK_SIZE;
    2322
     
    178177        // IDISA function calls
    179178        //
    180         public static IdisaFuncCallNode makeIdisaFuncCallNode(Locator locator, IDISABuiltin builtin, int fw, ASTNode... args ) {
    181             String packageName = builtin.packageName();
    182             String baseName = builtin.baseName();
     179        public static IdisaFuncCallNode makeIdisaFuncCallNode(Locator locator, IDISABuiltin simdNot, int fw, ASTNode... astNodes ) {
     180            String packageName = simdNot.packageName();
     181            String baseName = simdNot.baseName();
    183182            FieldWidthNode fieldWidth = Generators.makeIdisaFieldWidthNode(locator, fw);
    184             return makeIdisaFuncCallNode(locator, packageName, baseName, fieldWidth, args);
     183            return makeIdisaFuncCallNode(locator, packageName, baseName, fieldWidth, astNodes);
    185184    }
    186185       
  • proto/s2k/trunk/framework/src/toolchain/b2k/ast/Mutators.java

    r3808 r4024  
    11package toolchain.b2k.ast;
    22
    3 import static toolchain.b2k.lang.idisa.IDISABuiltin.BITBLOCK_ANY;
     3import static toolchain.b2k.lang.paramBuiltin.idisa.IDISABuiltin.BITBLOCK_ANY;
    44import static toolchain.b2k.lang.type.PrimitiveType.BITBLOCK_SIZE;
    55import b2k.ast.ASTNode;
  • proto/s2k/trunk/framework/src/toolchain/b2k/codeGenerator/visitors/CodeGenerator.java

    r3839 r4024  
    3838import b2k.ast.*;
    3939import toolchain.b2k.ast.Accessors;
    40 import toolchain.b2k.lang.idisa.AbstractIDISABuiltinTranslator;
    41 import toolchain.b2k.lang.idisa.AbstractIDISABuiltinGenerator;
     40import toolchain.b2k.lang.builtin.AbstractB2KBuiltinsEncoder;
     41import toolchain.b2k.lang.builtin.B2KBuiltins;
     42import toolchain.b2k.lang.builtin.KernelBuiltins;
    4243import toolchain.b2k.codeGenerator.util.CodeStore;
    4344import toolchain.b2k.codeGenerator.util.CodeGeneratorUtil;
    44 import toolchain.b2k.lang.AbstractB2KBuiltinsEncoder;
    45 import toolchain.b2k.lang.B2KBuiltins;
    46 import toolchain.b2k.lang.KernelBuiltins;
    47 import toolchain.b2k.lang.idisa.IDISABuiltin;
     45import toolchain.b2k.lang.paramBuiltin.idisa.AbstractIDISABuiltinGenerator;
     46import toolchain.b2k.lang.paramBuiltin.idisa.AbstractIDISABuiltinTranslator;
     47import toolchain.b2k.lang.paramBuiltin.idisa.IDISABuiltin;
    4848
    4949import java.util.ArrayList;
Note: See TracChangeset for help on using the changeset viewer.