Merge pull request #177 from alainmarcel/alainmarcel-patch-1

fixed some issues with tf_call model

CMakeLists.txt

@@ -100,7 +100,8 @@ set(uhdm_SRC
     ${PROJECT_SOURCE_DIR}/src/property_inst_spec_group.cpp
     ${PROJECT_SOURCE_DIR}/src/property_expr_named_event_group.cpp
     ${PROJECT_SOURCE_DIR}/src/property_expr_group.cpp
-    ${PROJECT_SOURCE_DIR}/src/pattern_expr_group.cpp)
+    ${PROJECT_SOURCE_DIR}/src/pattern_expr_group.cpp
+    ${PROJECT_SOURCE_DIR}/src/expr_constr_group.cpp)
 
 foreach(src_file ${uhdm_SRC})
   set_source_files_properties(${src_file} PROPERTIES GENERATED TRUE)

model/constraint.yaml

@@ -0,0 +1,18 @@
+# Copyright 2019-2020 Alain Dargelas
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Universal Hardware Data Model (UHDM) "constraint" formal description
+
+- obj_def: constraint
+

model/with_expr_constr_group.yaml → model/expr_constr_group.yaml

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Universal Hardware Data Model (UHDM) "with_expr_constr_group" formal description
+# Universal Hardware Data Model (UHDM) "expr_constr_group" formal description
 
-- group_def: with_expr_constr_group
+- group_def: expr_constr_group
   - class_ref: expr
   - obj_ref: constraint

model/func_call.yaml

@@ -15,7 +15,6 @@
 # Universal Hardware Data Model (UHDM) "func_call" formal description
 
 - obj_def: func_call
-  - extends: expr
   - extends: tf_call
   - property: func_type
     name: type

model/method_func_call.yaml

@@ -16,4 +16,18 @@
 
 - obj_def: method_func_call
   - extends: tf_call
-  - extends: expr
+  - property: is_built_in
+    name: is built in
+    type: bool
+    vpi: vpiUserDefn
+    card: 1
+  - class_ref: prefix
+    name: prefix
+    type: expr
+    vpi: vpiPrefix
+    card: 1
+  - group_ref: with
+    name: with
+    type: expr_constr_group
+    vpi: vpiWith
+    card: 1

model/method_func_task_call_group.yaml

@@ -18,18 +18,3 @@
   # Should extend: tf_call, but a group cannot - will be done in members
   - obj_ref: method_func_call
   - obj_ref: method_task_call
-  - class_ref: prefix
-    name: prefix
-    type: expr
-    vpi: vpiPrefix
-    card: 1
-  - group_ref: with
-    name: with
-    type: with_expr_constr_group
-    vpi: vpiWith
-    card: 1
-  - property: is_built_in
-    name: is built in
-    type: bool
-    vpi: vpiUserDefn
-    card: 1

model/method_task_call.yaml

@@ -16,3 +16,18 @@
 
 - obj_def: method_task_call
   - extends: tf_call
+  - property: is_built_in
+    name: is built in
+    type: bool
+    vpi: vpiUserDefn
+    card: 1
+  - class_ref: prefix
+    name: prefix
+    type: expr
+    vpi: vpiPrefix
+    card: 1
+  - group_ref: with
+    name: with
+    type: expr_constr_group
+    vpi: vpiWith
+    card: 1   

model/models.lst

@@ -181,11 +181,15 @@ enum_const.yaml
 bit_typespec.yaml
 tf_call_args.yaml
 tf_call.yaml
+user_systf.yaml
 sys_func_task_call_group.yaml
 sys_func_call.yaml
-with_expr_constr_group.yaml
+sys_task_call.yaml
+expr_constr_group.yaml
 method_func_task_call_group.yaml
 method_func_call.yaml
 method_task_call.yaml
 func_call.yaml
+task_call.yaml
+constraint.yaml
 uhdm.yaml

model/sys_func_call.yaml

@@ -21,3 +21,13 @@
     type: int
     vpi: vpiFuncType
     card: 1
+  - property: user_defined
+    name: user-defined
+    type: bool
+    vpi: vpiUserDefn
+    card: 1
+  - obj_ref: user_systf
+    name: user systf
+    type: user_systf
+    vpi: vpiUserSystf
+    card: 1

model/sys_func_task_call_group.yaml

@@ -18,18 +18,4 @@
   # Should extend: tf_call, but a group cannot - will be done in members
   - obj_ref: sys_func_call
   - obj_ref: sys_task_call
-  - property: user_defined
-    name: user-defined
-    type: bool
-    vpi: vpiUserDefn
-    card: 1
-  - property: decompile
-    name: decompile
-    type: str
-    vpi: vpiDecompile
-    card: 1
-  - obj_ref: user_systf
-    name: user systf
-    type: user_systf
-    vpi: vpiUserSystf
-    card: 1
+

model/sys_task_call.yaml

@@ -0,0 +1,29 @@
+# Copyright 2019-2020 Alain Dargelas
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Universal Hardware Data Model (UHDM) "sys_task_call" formal description
+
+- obj_def: sys_task_call
+  - extends: tf_call
+  - property: user_defined
+    name: user-defined
+    type: bool
+    vpi: vpiUserDefn
+    card: 1
+  - obj_ref: user_systf
+    name: user systf
+    type: user_systf
+    vpi: vpiUserSystf
+    card: 1
+

model/task_call.yaml

@@ -0,0 +1,23 @@
+# Copyright 2019-2020 Alain Dargelas
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Universal Hardware Data Model (UHDM) "task_call" formal description
+
+- obj_def: task_call
+  - extends: tf_call
+  - obj_ref: task
+    name: task
+    type: task
+    vpi: vpiTask
+    card: 1

model/user_systf.yaml

@@ -0,0 +1,17 @@
+# Copyright 2019-2020 Alain Dargelas
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Universal Hardware Data Model (UHDM) "user_systf" formal description
+
+- obj_def: user_systf