Verilog: support virtual interface variables

Signed-off-by: Hiroo HAYASHI <24754036+hirooih@users.noreply.github.com>
universal-ctags · May 11, 2023 · 55bfbe4 · 55bfbe4
1 parent 6b06565
commit 55bfbe4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/Units/parser-verilog.r/systemverilog-interface.d/expected.tags b/Units/parser-verilog.r/systemverilog-interface.d/expected.tags
@@ -28,3 +28,8 @@ intf_automatic	input.sv	/^interface automatic intf_automatic;$/;"	I
 logic_automatic	input.sv	/^    logic logic_automatic;$/;"	r	interface:intf_automatic
 intf_automatic.logic_automatic	input.sv	/^    logic logic_automatic;$/;"	r	interface:intf_automatic
 external_interface	input.sv	/^extern interface external_interface;$/;"	Q
+ubus_env	input.sv	/^class ubus_env extends uvm_env;$/;"	C
+vif	input.sv	/^  protected virtual interface ubus_if vif;$/;"	r	class:ubus_env
+ubus_env.vif	input.sv	/^  protected virtual interface ubus_if vif;$/;"	r	class:ubus_env
+has_bus_monitor	input.sv	/^  protected bit has_bus_monitor = 1;$/;"	r	class:ubus_env
+ubus_env.has_bus_monitor	input.sv	/^  protected bit has_bus_monitor = 1;$/;"	r	class:ubus_env
diff --git a/Units/parser-verilog.r/systemverilog-interface.d/input.sv b/Units/parser-verilog.r/systemverilog-interface.d/input.sv
@@ -22,3 +22,13 @@ interface automatic intf_automatic;
 endinterface
 
 extern interface external_interface;
+
+// from UVM-1.2
+class ubus_env extends uvm_env;
+
+  // Virtual Interface variable
+  protected virtual interface ubus_if vif;
+
+  // Control properties
+  protected bit has_bus_monitor = 1;
+endclass : ubus_env
diff --git a/parsers/verilog.c b/parsers/verilog.c
@@ -106,6 +106,7 @@ typedef enum {
 	K_IFCLASS,	/* interface class */
 	K_CONSTRAINT,
 	K_NETTYPE,
+	K_VIRTUAL,
 } verilogKind;
 
 typedef enum {
@@ -132,6 +133,7 @@ typedef struct sTokenInfo {
 	bool                classScope;    /* Context is local to the current sub-context */
 	bool				parameter;	   /* parameter which can be overridden */
 	bool				hasParamList;  /* module definition has a parameter port list */
+	bool		    virtual;       /* has virtual */
 } tokenInfo;
 
 typedef enum {
@@ -292,7 +294,7 @@ static const keywordAssoc KeywordTable [] = {
 	{ "void",          	K_REGISTER,  	{ 1, 0 } },
 	{ "with",          	K_WITH,			{ 1, 0 } },
 	{ "nettype",       	K_NETTYPE,		{ 1, 0 } },
-//	{ "virtual",       	K_PROTOTYPE,	{ 1, 0 } },		// do not add for now
+	{ "virtual",       	K_VIRTUAL,	{ 1, 0 } },
 };
 
 static tokenInfo *currentContext = NULL;
@@ -496,6 +498,7 @@ static void clearToken (tokenInfo *token)
 	token->classScope = false;
 	token->parameter = false;
 	token->hasParamList = false;
+	token->virtual = false;
 }
 
 static tokenInfo *newToken (void)
@@ -1973,6 +1976,10 @@ static int findTag (tokenInfo *const token, int c)
 			break;
 
 		case K_INTERFACE:
+			// a virtual interface variable
+			if (currentContext->virtual)
+				break;
+			// fallthrough
 		case K_MODULE:
 		case K_PROGRAM:
 			c = processDesignElementL (token, c);
@@ -2010,6 +2017,10 @@ static int findTag (tokenInfo *const token, int c)
 			c = processDefine (token, c);
 			break;
 
+		case K_VIRTUAL:
+			currentContext->virtual = true;
+			break;
+
 		case K_IGNORE:
 			break;
 		default: