From 8c757c6cd7d22cb607de9c7acdda4ebb8ccf23d9 Mon Sep 17 00:00:00 2001 From: donker <donker@astron.nl> Date: Mon, 25 Oct 2021 09:24:25 +0200 Subject: [PATCH] L2SDP-436, fix bug mmap. --- src/tools/mmap.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tools/mmap.cpp b/src/tools/mmap.cpp index ef44e520..4d48df92 100644 --- a/src/tools/mmap.cpp +++ b/src/tools/mmap.cpp @@ -188,9 +188,9 @@ CMMap mmap_to_regmap(istringstream& iss) } /* Code to remove sscanf */ - strs >> mm_mask_hi; + strs >> dec >> mm_mask_hi; strs >> sep; - strs >> mm_mask_lo; + strs >> dec >> mm_mask_lo; mask = 0; for (int i=mm_mask_lo; i<=mm_mask_hi; i++) { mask |= (1 << i); @@ -199,15 +199,15 @@ CMMap mmap_to_regmap(istringstream& iss) mm_info.mm_mask = mask; } mm_info.shift = mm_mask_lo; - + strs >> val_str; // get user_mask if (val_str != "-") { stringstream ss(val_str); - ss >> user_mask_hi; + ss >> dec >> user_mask_hi; ss >> sep; - ss >> user_mask_lo; + ss >> dec >> user_mask_lo; mask = 0; - for (int i=mm_mask_lo; i<=mm_mask_hi; i++) { + for (int i=user_mask_lo; i<=user_mask_hi; i++) { mask |= (1<<i); } mm_info.user_mask = mask; -- GitLab