idlc 0.1.2 → 0.1.5

data/lib/idlc/cli.rb

@@ -12,6 +12,15 @@ require "optparse"
 require "yaml"
 
 module Idl
+  # Minimal register-file descriptor used by the CLI when no architecture is configured.
+  # Provides the interface that SymbolTable.new(register_files:) expects.
+  DefaultXRegisterFile = Struct.new(:name, :register_length, :registers) do
+    def self.build(xlen = 64)
+      registers = Array.new(32) { |i| Struct.new(:name).new("x#{i}") }
+      new("X", "return #{xlen};", registers)
+    end
+  end
+
   class Cli
     extend Forwardable
     def_delegators :@runner,
@@ -48,7 +57,7 @@ module Idl
       end
 
       compiler = Compiler.new
-      symtab = SymbolTable.new
+      symtab = SymbolTable.new(register_files: [DefaultXRegisterFile.build])
 
       add_defines(compiler, symtab)
       expr_ast = compiler.compile_expression(args[0], symtab)
@@ -104,7 +113,7 @@ module Idl
 
     def do_tc_inst(args, options, vars)
       compiler = Compiler.new
-      symtab = SymbolTable.new
+      symtab = SymbolTable.new(register_files: [DefaultXRegisterFile.build])
 
       add_defines(compiler, symtab)
       symtab.push(nil)

data/lib/idlc/idl.treetop

@@ -66,32 +66,36 @@ grammar Idl
   end
 
   rule int
-    # verilog style: explicit bit width
-    (([0-9]+)/'MXLEN')? "'" 'b' [0-1xX] [0-1_xX]* <Idl::IntLiteralSyntaxNode> /
-    (([0-9]+)/'MXLEN')? "'" 'o' [0-7xX] [0-7_xX]* <Idl::IntLiteralSyntaxNode> /
-    (([0-9]+)/'MXLEN')? "'" 'd'? [0-9] [0-9_]* <Idl::IntLiteralSyntaxNode> /
-    (([0-9]+)/'MXLEN')? "'" 'h' [0-9a-fA-FxX] [0-9a-fA-F_xX]* <Idl::IntLiteralSyntaxNode> /
+    # plain decimal (most common) — tried first; disjoint from all other alternatives
+    # (other alternatives start with '0', "'", or require a trailing 's' suffix)
+    # Negative lookahead !"'" ensures we don't consume the width prefix of a Verilog literal (e.g. 32'b...)
+    [1-9] [0-9]* !"'" 's' <Idl::IntLiteralSyntaxNode> /
+    [1-9] [0-9]* !"'" <Idl::IntLiteralSyntaxNode> /
 
-    # verilog style: explicit bit width, signed
-    (([0-9]+)/'MXLEN')? "'" 'sb' [0-1xX] [0-1_xX]* <Idl::IntLiteralSyntaxNode> /
-    (([0-9]+)/'MXLEN')? "'" 'so' [0-7xX] [0-7_xX]* <Idl::IntLiteralSyntaxNode> /
-    (([0-9]+)/'MXLEN')? "'" 's' 'd'? [0-9] [0-9_]* <Idl::IntLiteralSyntaxNode> /
-    (([0-9]+)/'MXLEN')? "'" 'sh' [0-9a-fA-FxX] [0-9a-fA-F_xX]* <Idl::IntLiteralSyntaxNode> /
-
-    # c++ style: signed
+    # c++ style: signed (must come before unsigned to avoid consuming the trailing 's')
     '0b' [0-1] [0-1_]* 's' <Idl::IntLiteralSyntaxNode> /
     '0' [0-7] [0-7_]* 's' <Idl::IntLiteralSyntaxNode> /
-    [1-9] [0-9]* 's' <Idl::IntLiteralSyntaxNode> /
     '0x' [0-9a-fA-F] [0-9a-fA-F_]* 's' <Idl::IntLiteralSyntaxNode> /
 
     # c++ style: unsigned
     '0b' [0-1] [0-1_]* <Idl::IntLiteralSyntaxNode> /
     '0' [0-7] [0-7_]* <Idl::IntLiteralSyntaxNode> /
-    [1-9] [0-9]* <Idl::IntLiteralSyntaxNode> /
     '0x' [0-9a-fA-F] [0-9a-fA-F_]* <Idl::IntLiteralSyntaxNode> /
 
-    # special case: just a single 0
-    '0' 's'? <Idl::IntLiteralSyntaxNode>
+    # special case: just a single 0 (not followed by a verilog-style quote)
+    '0' !"'" 's'? <Idl::IntLiteralSyntaxNode> /
+
+    # verilog style: explicit bit width
+    (([0-9]+)/'MXLEN')? "'" 'b' [0-1xX] [0-1_xX]* <Idl::IntLiteralSyntaxNode> /
+    (([0-9]+)/'MXLEN')? "'" 'o' [0-7xX] [0-7_xX]* <Idl::IntLiteralSyntaxNode> /
+    (([0-9]+)/'MXLEN')? "'" 'd'? [0-9] [0-9_]* <Idl::IntLiteralSyntaxNode> /
+    (([0-9]+)/'MXLEN')? "'" 'h' [0-9a-fA-FxX] [0-9a-fA-F_xX]* <Idl::IntLiteralSyntaxNode> /
+
+    # verilog style: explicit bit width, signed
+    (([0-9]+)/'MXLEN')? "'" 'sb' [0-1xX] [0-1_xX]* <Idl::IntLiteralSyntaxNode> /
+    (([0-9]+)/'MXLEN')? "'" 'so' [0-7xX] [0-7_xX]* <Idl::IntLiteralSyntaxNode> /
+    (([0-9]+)/'MXLEN')? "'" 's' 'd'? [0-9] [0-9_]* <Idl::IntLiteralSyntaxNode> /
+    (([0-9]+)/'MXLEN')? "'" 'sh' [0-9a-fA-FxX] [0-9a-fA-F_xX]* <Idl::IntLiteralSyntaxNode>
   end
 
   rule p0_binary_operator
@@ -299,7 +303,7 @@ grammar Idl
 
   # expression that can accept an array index operator (expr[])
   rule ary_eligible_expression
-    enum_to_a
+    dollar_function_call
     /
     paren_expression
     /
@@ -313,7 +317,7 @@ grammar Idl
     /
     csr_field_access_expression
     /
-    bits_cast
+    csr_register_access_expression
     /
     rval # must come last!
   end
@@ -330,20 +334,16 @@ grammar Idl
     rval space* '++' <Idl::PostIncrementExpressionSyntaxNode>
   end
 
-  rule bits_cast
-    '$bits' space* '(' space*
-      expr:(
-        csr_register_access_expression
-        /
-        enum_ref
-        /
-        expression
-      )
-    space* ')' <Idl::BitsCastSyntaxNode>
+  rule dollar_function_call
+    '$' name:([a-zA-Z_] [a-zA-Z0-9_?]*) space* '(' space* args:dollar_arg_list space* ')' <Idl::DollarFunctionCallSyntaxNode>
+  end
+
+  rule dollar_variable
+    '$' name:([a-zA-Z_] [a-zA-Z0-9_]*) <Idl::DollarVariableSyntaxNode>
   end
 
-  rule enum_to_a
-    '$enum_to_a' space* '(' space* type_name ')' <Idl::EnumArrayCastSyntaxNode>
+  rule dollar_arg_list
+    first:expression? rest:(space* ',' space* expression)*
   end
 
   rule unary_expression
@@ -355,24 +355,7 @@ grammar Idl
     /
     ary_access
     /
-    # get the width (N) of a Bits type. Mostly just useful for writing tests and checking types
-    '$width' space* '(' space* expression space* ')' <Idl::WidthRevealSyntaxNode>
-    /
-    '$signed' space* '(' space* expression space* ')' <Idl::SignCastSyntaxNode>
-    /
-    bits_cast
-    /
-    '$enum_size' space* '(' space* type_name ')' <Idl::EnumSizeSyntaxNode>
-    /
-    '$enum_element_size' space* '(' space* type_name ')' <Idl::EnumElementSizeSyntaxNode>
-    /
-    enum_to_a
-    /
-    '$enum' space* '(' space* type_name space* ',' space* expression space* ')' <Idl::EnumCastSyntaxNode>
-    /
-    '$array_size' space* '(' space* expression ')' <Idl::ArraySizeSyntaxNode>
-    /
-    '$array_includes?' space* '(' space* ary:ary_eligible_expression space* ',' space* value:expression space* ')' <Idl::ArrayIncludesSyntaxNode>
+    dollar_function_call
     /
     paren_expression
     /
@@ -392,6 +375,8 @@ grammar Idl
     /
     csr_field_access_expression
     /
+    csr_register_access_expression
+    /
     enum_ref
     /
     rval # must come last
@@ -443,11 +428,12 @@ grammar Idl
   end
 
   rule function_call
+    # plain function call is most common; CSR calls require literal "CSR[" prefix so these are disjoint
+    function_name space* '(' space* function_arg_list space* ')' <Idl::FunctionCallExpressionSyntaxNode>
+    /
     csr:csr_register_access_expression space* '.' space* 'sw_write' space* '(' space* expression space* ')' <Idl::CsrSoftwareWriteSyntaxNode>
     /
     csr:csr_register_access_expression space* '.' space* function_name space* '(' space* function_arg_list space* ')' <Idl::CsrFunctionCallSyntaxNode>
-    /
-    function_name space* '(' space* function_arg_list space* ')' <Idl::FunctionCallExpressionSyntaxNode>
   end
 
   rule function_name
@@ -505,19 +491,18 @@ grammar Idl
   end
 
   rule rval
-    (int / builtin_read_only_var / builtin_read_write_var / string / id)
+    (int / dollar_variable / string / id)
   end
 
   rule assignment
     '(' first:(id / dontcare_lvalue) space* rest:(',' space* var:(id / dontcare_lvalue) space*)+ ')' space* '=' space* function_call <Idl::MultiVariableAssignmentSyntaxNode> /
     single_declaration_with_initialization /
-    '$pc' space* '=' space* rval:expression <Idl::PcAssignmentSyntaxNode> /
+    dollar_variable space* '=' space* rval:expression <Idl::DollarVariableAssignmentSyntaxNode> /
     var:id space* '=' space* rval:expression <Idl::VariableAssignmentSyntaxNode> /
     # note: there is no full CSR assignment (must assign fields)
     csr_field_access_expression space* '=' space* rval:expression <Idl::CsrFieldAssignmentSyntaxNode> /
     id space* '.' space* field_name space* '=' space* rval:expression <Idl::FieldAssignmentSyntaxNode> /
-    var:ary_eligible_expression space* '[' space* msb:expression space* ':' space* lsb:expression space* ']' space* '=' space* rval:expression <Idl::AryRangeAssignmentSyntaxNode> /
-    var:ary_eligible_expression space* '[' space* idx:expression space* ']' space* '=' space* rval:expression <Idl::AryElementAssignmentSyntaxNode>
+    var:ary_eligible_expression space* brackets:('[' space* msb:(expression space* ':' space*)? lsb:expression space* ']' space*)+ '=' space* rval:expression <Idl::AryRangeAssignmentSyntaxNode>
   end
 
   rule ary_size_decl
@@ -639,14 +624,6 @@ grammar Idl
     [A-Za-z] [A-Za-z_0-9]* <Idl::IdSyntaxNode>
   end
 
-  rule builtin_read_only_var
-    "$encoding" <Idl::BuiltinVariableSyntaxNode>
-  end
-
-  rule builtin_read_write_var
-    "$pc" <Idl::BuiltinVariableSyntaxNode>
-  end
-
   rule csr_name
     [a-z] [a-z0-9_.]*
   end