Compare commits

..

No commits in common. "9c435112e80a319d33f72863597baf8bd86c743e" and "1f1fe1dff089dd89cef3165c6466b3a1c2c10884" have entirely different histories.

View File

@ -16,10 +16,7 @@ proc DictValueOr { dict key default } {
# EX: [SplitSub buz.bar foo] => "" # EX: [SplitSub buz.bar foo] => ""
proc SplitSub { str startword } { proc SplitSub { str startword } {
if { [string first $startword $str] == 0 } { if { [string first $startword $str] == 0 } {
# Start searching for the delimiter after the start word, otherwise set sepidx [string first "." "$str"]
# start words containing a delimiter will yield incorrect results
set start_substr_idx [string length $startword]
set sepidx [string first "." "$str" $start_substr_idx]
if { $sepidx == -1 } { if { $sepidx == -1 } {
return "" return ""
@ -172,7 +169,7 @@ proc ParseMemoryMapConf {iface_name memmap_conf} {
foreach block_name $blocks { foreach block_name $blocks {
puts "Parsing block $block_name of $memmap_name" puts "Parsing block $block_name of $memmap_name"
set block_conf [GetSubValues $memmap_conf BLOCK.$block_name] set block_conf [GetSubValues $memmap_conf $block_name]
AddMemoryMapBlock $memmap $block_name $block_conf AddMemoryMapBlock $memmap $block_name $block_conf
} }
} }