Compare commits

..

2 Commits

View File

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