Merge pull request syntacore#4 from syntacore/en-sc/use-scr-info

Support Syntacore platforms

Author: en-sc

tcl/target/syntacore_target.cfg

@@ -53,6 +53,7 @@ set __sc_target_defaults(chipname) riscv
 set __sc_target_defaults(expose_csrs) ""
 set __sc_target_defaults(disable_EQ_triggers) 1
 set __sc_target_defaults(disable_ebreak) 0
+set __sc_target_defaults(platform_extension) ""
 
 set __sc_target_defaults(smp_configuration) 0
 set __sc_target_defaults(gdb_report_data_abort) 1
@@ -75,6 +76,13 @@ proc proc_exists p {
 	# return uplevel 1 [expr {[llength [info procs $p]] > 0}]
 }
 
+proc check_and_call {msg proc_name args} {
+	if {![proc_exists $proc_name]} {
+		error $msg
+	}
+	tailcall $proc_name {*}$args
+}
+
 proc sc_pre_tap_hook {} {
 }
 
@@ -274,6 +282,14 @@ proc init_targets {} {
 		jtag newtap [dict get $tap_item prefix] [dict get $tap_item suffix] -irlen [dict get $tap_item irlen]
 	}
 
+	set _PLATFORM_EXT [sc_target_config_get platform_extension]
+	set _EXPOSED_REGISTERS ""
+	if {$_PLATFORM_EXT ne "" } {
+		set errmsg "incorrect version of scr_info platform extension plugin"
+		set platform_name [check_and_call $errmsg ::scr_info::type_name $_PLATFORM_EXT]
+		set _EXPOSED_REGISTERS [check_and_call $errmsg ::scr_info::expose_custom_string ${platform_name}]
+		sc_target_config_log "new registers from scr_info platform: $_EXPOSED_REGISTERS"
+	}
 	foreach tgt_item [lindex $tapmap 1] {
 		if {[sc_target_config_get no_ocd_targets] == 1} {
 			continue
@@ -303,6 +319,10 @@ proc init_targets {} {
 			$_TARGETNAME riscv hide_csrs $HIDE_CSRS
 		}
 
+		if {$_EXPOSED_REGISTERS ne ""} {
+			$_TARGETNAME riscv expose_csrs $_EXPOSED_REGISTERS
+		}
+
 		if {[sc_target_config_get expose_csrs] ne ""} {
 			$_TARGETNAME riscv expose_csrs [sc_target_config_get expose_csrs]
 		}

tools/syntacore/openocd_run.exp

@@ -52,6 +52,7 @@ set COMMAND_LINE_OPTIONS [dict create \
   --log-session "value:log_path. Path to session log" \
   --no-extra-scripts "flag. avoid loading of extra scripts (common routines to help with debugging)" \
   --no-targets "devel:flag. create only TAP, do not create OpenOCD targets" \
+  --platform "value:name. The name of the platform. Performs platform-specific initialization if appropriate plugin is available" \
   --reset-adapter "flag. enforce reset of debug adapter before use" \
   --run-command "value:command. extra TCL command to run. Can be specified multiple times. The command is run after init phase" \
   --run-script "value:file. additional TCL script to run. Can be specified multiple times. The script is run after init phase" \
@@ -101,6 +102,7 @@ set SETTINGS(load_extra_scripts) 1
 set SETTINGS(extra_run_commands) []
 set SETTINGS(extra_spike_args) []
 set SETTINGS(no_openocd_targets) 0
+set SETTINGS(platform) ""
 set SETTINGS(reset_adapter) 0
 
 set DEBUG_ADAPTER_INFO(adapter_string) ""
@@ -266,6 +268,8 @@ for { set i 0 } { $i < $argc } { incr i } {
     set SETTINGS(stand_db) $optarg
   } elseif { $option == $COMMAND_LINE_ARG(--no-targets) } {
     set SETTINGS(no_openocd_targets) 1
+  } elseif { $option == $COMMAND_LINE_ARG(--platform) } {
+    set SETTINGS(platform) $optarg
   } elseif { $option == $COMMAND_LINE_ARG(--reset-adapter) } {
     set SETTINGS(reset_adapter) 1
   } elseif { $option == $COMMAND_LINE_ARG(--help) } {
@@ -731,16 +735,19 @@ proc buildOpenOCDCommandLine {DebugInterfaceCfg AdapterSerial JtagTopologyString
       -c "sc_target_config jtag_topology ${JtagTopologyString}"]
   }
 
+  set ExtraLibraries [list]
   if {$SETTINGS(load_extra_scripts) == 1} {
-    set ExtraLibraries [list]
     lappend ExtraLibraries "[getOpenOCDRootDir]/share/openocd/scripts/syntacore/sc_fpga_lib.tcl"
-    foreach Lib $ExtraLibraries {
-      if {![file exists "$Lib"]} {
-        fatalError "unable to locate extra library: $Lib"
-      }
-      lappend OpenOCDArgs -f
-      lappend OpenOCDArgs "$Lib"
+  }
+  if {$SETTINGS(platform) ne ""} {
+    lappend ExtraLibraries "[getOpenOCDRootDir]/share/openocd/scripts/syntacore/scr_info.tcl"
+  }
+  foreach Lib $ExtraLibraries {
+    if {![file exists "$Lib"]} {
+      fatalError "unable to locate extra library: $Lib"
     }
+    lappend OpenOCDArgs -f
+    lappend OpenOCDArgs "$Lib"
   }
 
   if {$SETTINGS(ide_mode) == 1} {
@@ -783,6 +790,11 @@ proc buildOpenOCDCommandLine {DebugInterfaceCfg AdapterSerial JtagTopologyString
   lappend OpenOCDArgs -c
   lappend OpenOCDArgs "sc_target_config target_type $SETTINGS(target_type)"
 
+  if {$SETTINGS(platform) ne ""} {
+    lappend OpenOCDArgs -c
+    lappend OpenOCDArgs "sc_target_config platform_extension $SETTINGS(platform)"
+  }
+
   lappend OpenOCDArgs [deriveDesiredVerbosityOption]
 
   # Apparently, depending on the presence -c "init" command OpenOCD behaves