From 2bdb5bb5a8ee1a4903404ffb1ce6a6d4e856e6dd Mon Sep 17 00:00:00 2001
From: clc5q <clc5q@git.zephyr-software.com>
Date: Thu, 4 Jun 2015 02:54:59 +0000
Subject: [PATCH] Updated annotations after IDA Pro 6.8 upgrade.

Former-commit-id: 90ce357d4b9646a0b03f666f4212ec945171e7be
---
 tests/commit/save-busybox.psexe.infoannot     |   6 +-
 tests/commit/save-bzip2.psexe.infoannot       |   3 +
 ...save-ffmpeg.psexe.infoannot.REMOVED.git-id |   2 +-
 .../save-gnome-character-map.psexe.infoannot  |   3 +
 .../save-gnome-dictionary.psexe.infoannot     |   3 +
 .../save-gnome-font-viewer.psexe.infoannot    |   3 +
 tests/commit/save-gnome-help.psexe.infoannot  |   3 +
 .../save-gnome-keyring-daemon.psexe.infoannot |   3 +
 ...ave-gnome-power-statistics.psexe.infoannot |   3 +
 .../save-gnome-search-tool.psexe.infoannot    |   3 +
 .../save-gnome-sound-recorder.psexe.infoannot |   3 +
 .../save-gnome-system-log.psexe.infoannot     |   3 +
 tests/commit/save-httpd.psexe.infoannot       |  12 +-
 tests/commit/save-less.psexe.infoannot        |   3 +
 tests/commit/save-ls-64bit.psexe.infoannot    |   3 +
 tests/commit/save-lt-svn.psexe.infoannot      |  24 ++--
 tests/commit/save-nginx.psexe.infoannot       |  72 +++++------
 tests/commit/save-synaptic.psexe.infoannot    |   5 +-
 tests/commit/save-xedit.psexe.infoannot       |  24 +++-
 tests/commit/save-xeyes.psexe.infoannot       |   3 +
 ...ed-save-busybox.psexe.annot.REMOVED.git-id |   2 +-
 .../trimmed-sorted-save-bzip2.psexe.annot     |  99 ++++++++++++---
 ...ted-save-ffmpeg.psexe.annot.REMOVED.git-id |   2 +-
 ...ave-firefox-bin.psexe.annot.REMOVED.git-id |   2 +-
 ...orted-save-gimp.psexe.annot.REMOVED.git-id |   2 +-
 ...orted-save-gnome-character-map.psexe.annot |  99 ++++++++++++---
 ...d-sorted-save-gnome-dictionary.psexe.annot |  99 ++++++++++++---
 ...-sorted-save-gnome-font-viewer.psexe.annot |  99 ++++++++++++---
 ...trimmed-sorted-save-gnome-help.psexe.annot |  99 ++++++++++++---
 ...-keyring-daemon.psexe.annot.REMOVED.git-id |   2 +-
 ...ed-save-gnome-power-statistics.psexe.annot | 115 ++++++++++++++----
 ...ome-search-tool.psexe.annot.REMOVED.git-id |   2 +-
 ...rted-save-gnome-sound-recorder.psexe.annot |  99 ++++++++++++---
 ...d-sorted-save-gnome-system-log.psexe.annot |  99 ++++++++++++---
 ...-system-monitor.psexe.annot.REMOVED.git-id |   2 +-
 ...orted-save-grep.psexe.annot.REMOVED.git-id |   2 +-
 ...rted-save-httpd.psexe.annot.REMOVED.git-id |   2 +-
 ...orted-save-less.psexe.annot.REMOVED.git-id |   2 +-
 ...d-save-ls-64bit.psexe.annot.REMOVED.git-id |   2 +-
 ...ted-save-lt-svn.psexe.annot.REMOVED.git-id |   2 +-
 ...rted-save-nginx.psexe.annot.REMOVED.git-id |   2 +-
 ...ed-save-openssl.psexe.annot.REMOVED.git-id |   2 +-
 ...d-save-synaptic.psexe.annot.REMOVED.git-id |   2 +-
 ...rted-save-xedit.psexe.annot.REMOVED.git-id |   2 +-
 .../trimmed-sorted-save-xeyes.psexe.annot     |  99 ++++++++++++---
 tests/quick/save-bzip2.psexe.infoannot        |   3 +
 .../trimmed-sorted-save-bzip2.psexe.annot     |  99 ++++++++++++---
 47 files changed, 991 insertions(+), 234 deletions(-)

diff --git a/tests/commit/save-busybox.psexe.infoannot b/tests/commit/save-busybox.psexe.infoannot
index 23ee9cf1..2e6eeba1 100644
--- a/tests/commit/save-busybox.psexe.infoannot
+++ b/tests/commit/save-busybox.psexe.infoannot
@@ -1544,7 +1544,7 @@
     418649    687 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     4188f8    637 FUNC RETURNTYPE RAX 0
     4188f8    637 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
-    4189d3      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R15+1 ZZ lea     rsi, [r15+1]    ; char 
+    4189d3      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R15+1 ZZ lea     rsi, [r15+1] 
     418b75    567 FUNC RETURNTYPE RAX 1
     418b75    567 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     418e76    107 FUNC RETURNTYPE RAX 4
@@ -2680,8 +2680,8 @@
     43567a    926 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     4356ed      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EBX ZZ inc     ebx 
     435742      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+20 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r14+14h] 
-    435770      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+108 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r14+6Ch]  ; char 
-    43579c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+44 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r14+2Ch]  ; char 
+    435770      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+108 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r14+6Ch] 
+    43579c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+44 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r14+2Ch] 
     4358c3      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RBX+RBX ZZ IDIOM 32 lea     edi, [rbx+rbx] 
     4358c8      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, 9 
     4358e9      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, [rbp+0] 
diff --git a/tests/commit/save-bzip2.psexe.infoannot b/tests/commit/save-bzip2.psexe.infoannot
index 8462e17f..e9f11c1a 100644
--- a/tests/commit/save-bzip2.psexe.infoannot
+++ b/tests/commit/save-bzip2.psexe.infoannot
@@ -174,6 +174,9 @@
     403c00    739 FUNC INARGS    6  ARG0 96 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     403ef0   1607 FUNC RETURNTYPE RAX 1
     403ef0   1607 FUNC INARGS    6  ARG0 96 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    404540    137 FUNC RETURNTYPE RAX 0
+    404540    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    404540    137 FUNC PROBLEM init CALLUNRESOLVED 
     4045d0      2 FUNC RETURNTYPE RAX 0
     4045d0      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
     4045e0     54 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id b/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
index a2ceec38..cbcce7de 100644
--- a/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
+++ b/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
@@ -1 +1 @@
-aa655842790f811d1fceddea1dd1a6e9e78ac974
\ No newline at end of file
+09ee4b0a42a8306e8256511d6af82bc3b82d3d9c
\ No newline at end of file
diff --git a/tests/commit/save-gnome-character-map.psexe.infoannot b/tests/commit/save-gnome-character-map.psexe.infoannot
index 62cbd4d9..8d458be8 100644
--- a/tests/commit/save-gnome-character-map.psexe.infoannot
+++ b/tests/commit/save-gnome-character-map.psexe.infoannot
@@ -695,6 +695,9 @@
     40b400   1923 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     40bb90     48 FUNC RETURNTYPE RAX 0
     40bb90     48 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    40bbc0    137 FUNC RETURNTYPE RAX 0
+    40bbc0    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    40bbc0    137 FUNC PROBLEM init CALLUNRESOLVED 
     40bc50      2 FUNC RETURNTYPE RAX 0
     40bc50      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
     40bc60     54 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-dictionary.psexe.infoannot b/tests/commit/save-gnome-dictionary.psexe.infoannot
index eeeb7a8b..6c801fb4 100644
--- a/tests/commit/save-gnome-dictionary.psexe.infoannot
+++ b/tests/commit/save-gnome-dictionary.psexe.infoannot
@@ -984,6 +984,9 @@
     4123a0     43 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     4123d0    562 FUNC RETURNTYPE RAX 0
     4123d0    562 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    412610    137 FUNC RETURNTYPE RAX 0
+    412610    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    412610    137 FUNC PROBLEM init CALLUNRESOLVED 
     4126a0      2 FUNC RETURNTYPE RAX 0
     4126a0      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
     4126b0     54 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-font-viewer.psexe.infoannot b/tests/commit/save-gnome-font-viewer.psexe.infoannot
index a2a938b7..ba93f8c7 100644
--- a/tests/commit/save-gnome-font-viewer.psexe.infoannot
+++ b/tests/commit/save-gnome-font-viewer.psexe.infoannot
@@ -260,6 +260,9 @@
     403ff0    134 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     404080    202 FUNC RETURNTYPE RAX 4
     404080    202 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+    4044d0    137 FUNC RETURNTYPE RAX 0
+    4044d0    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    4044d0    137 FUNC PROBLEM init CALLUNRESOLVED 
     404560      2 FUNC RETURNTYPE RAX 0
     404560      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
     404570     54 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-help.psexe.infoannot b/tests/commit/save-gnome-help.psexe.infoannot
index ef275fc2..63b45805 100644
--- a/tests/commit/save-gnome-help.psexe.infoannot
+++ b/tests/commit/save-gnome-help.psexe.infoannot
@@ -537,6 +537,9 @@
     4092b0     71 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     409300     80 FUNC RETURNTYPE RAX 0
     409300     80 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
+    409350    137 FUNC RETURNTYPE RAX 0
+    409350    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    409350    137 FUNC PROBLEM init CALLUNRESOLVED 
     4093e0      2 FUNC RETURNTYPE RAX 0
     4093e0      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
     4093f0     54 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-keyring-daemon.psexe.infoannot b/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
index af5c93f4..9616207a 100644
--- a/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
+++ b/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
@@ -4482,6 +4482,9 @@
     49d3e2      2 INSTR INFINITELOOP jmp     short loc_49D3E2 
     49d440    143 FUNC RETURNTYPE RAX 0
     49d440    143 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    49d4d0    137 FUNC RETURNTYPE RAX 0
+    49d4d0    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    49d4d0    137 FUNC PROBLEM init CALLUNRESOLVED 
     49d560      2 FUNC RETURNTYPE RAX 0
     49d560      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
     49d570     26 FUNC RETURNTYPE RAX 4
diff --git a/tests/commit/save-gnome-power-statistics.psexe.infoannot b/tests/commit/save-gnome-power-statistics.psexe.infoannot
index 3013b78a..7b63b1a0 100644
--- a/tests/commit/save-gnome-power-statistics.psexe.infoannot
+++ b/tests/commit/save-gnome-power-statistics.psexe.infoannot
@@ -508,6 +508,9 @@
     40bae0    271 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
     40bbf0     25 FUNC RETURNTYPE RAX 1
     40bbf0     25 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    40bc10    137 FUNC RETURNTYPE RAX 0
+    40bc10    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    40bc10    137 FUNC PROBLEM init CALLUNRESOLVED 
     40bca0      2 FUNC RETURNTYPE RAX 0
     40bca0      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
     40bcb0     54 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-search-tool.psexe.infoannot b/tests/commit/save-gnome-search-tool.psexe.infoannot
index 6346cf5e..1bd70592 100644
--- a/tests/commit/save-gnome-search-tool.psexe.infoannot
+++ b/tests/commit/save-gnome-search-tool.psexe.infoannot
@@ -1418,6 +1418,9 @@
     41e720    117 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     41eab0     37 FUNC RETURNTYPE RAX 0
     41eab0     37 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    41eae0    137 FUNC RETURNTYPE RAX 0
+    41eae0    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    41eae0    137 FUNC PROBLEM init CALLUNRESOLVED 
     41eb70      2 FUNC RETURNTYPE RAX 0
     41eb70      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
     41eb80     54 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-sound-recorder.psexe.infoannot b/tests/commit/save-gnome-sound-recorder.psexe.infoannot
index 75ee5506..26ec707f 100644
--- a/tests/commit/save-gnome-sound-recorder.psexe.infoannot
+++ b/tests/commit/save-gnome-sound-recorder.psexe.infoannot
@@ -700,6 +700,9 @@
     40ce30    350 FUNC RETURNTYPE RAX 0
     40ce30    350 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     40cebc      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+184 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r13+0B8h] 
+    40cf90    137 FUNC RETURNTYPE RAX 0
+    40cf90    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    40cf90    137 FUNC PROBLEM init CALLUNRESOLVED 
     40d020      2 FUNC RETURNTYPE RAX 0
     40d020      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
     40d030     54 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-system-log.psexe.infoannot b/tests/commit/save-gnome-system-log.psexe.infoannot
index 4f6c2749..a225e541 100644
--- a/tests/commit/save-gnome-system-log.psexe.infoannot
+++ b/tests/commit/save-gnome-system-log.psexe.infoannot
@@ -1152,6 +1152,9 @@
     413a20     60 FUNC PROBLEM sub_413A20 JUMPUNRESOLVED 
     413ed0     25 FUNC RETURNTYPE RAX 1
     413ed0     25 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    413fb0    137 FUNC RETURNTYPE RAX 0
+    413fb0    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    413fb0    137 FUNC PROBLEM init CALLUNRESOLVED 
     414040      2 FUNC RETURNTYPE RAX 0
     414040      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
     414050     54 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-httpd.psexe.infoannot b/tests/commit/save-httpd.psexe.infoannot
index 25f3c4ad..a8c6b841 100644
--- a/tests/commit/save-httpd.psexe.infoannot
+++ b/tests/commit/save-httpd.psexe.infoannot
@@ -2082,7 +2082,7 @@
     4339a0   2194 FUNC INARGS    2  ARG0 4 ARG1 0 
     4339e6      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 2 
     433a2c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+RDX ZZ IDIOM 18 MEMORYSINK lea     rax, [last_len+rdx] 
-    433a87      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+R12 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rcx+last_len]; dest 
+    433a87      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+R12 ZZ IDIOM 18 MEMORYSINK lea     rdi, [last_field_0+last_len]; dest 
     433ace      4 INSTR CHECK OVERFLOW SIGNED 64  R15 ZZ add     r15d, 1 
     434240     72 FUNC RETURNTYPE RAX 96
     434240     72 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -3178,7 +3178,7 @@
     44e3fb      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, r13d       ; int 
     44e3fe      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ IDIOM 18 STACKMEMSINK add     rdx, rax        ; char * 
     44e6ac      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, 198h       ; id 
-    44e73f      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+176 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+0B0h] ; id 
+    44e73f      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+176 ZZ IDIOM 18 MEMORYSINK lea     rdx, [c_0+0B0h] ; id 
     44e7d0    179 FUNC RETURNTYPE RAX 96
     44e7d0    179 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 4 
     44e890    180 FUNC RETURNTYPE RAX 96
@@ -3714,18 +3714,18 @@
     45eb50   4999 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     45ef7f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+32 ZZ IDIOM 18 MEMORYSINK lea     rcx, [f+20h] 
     45ef83      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+24 ZZ IDIOM 18 MEMORYSINK lea     rdx, [f+18h] 
-    45ef87      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+28 ZZ IDIOM 18 MEMORYSINK lea     rdi, [ctx+1Ch]  ; http_error 
+    45ef87      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+28 ZZ IDIOM 18 MEMORYSINK lea     rdi, [ctx+1Ch] 
     45f01b      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+32 ZZ IDIOM 18 MEMORYSINK lea     rdi, [ctx+20h]  ; b 
     45f3cb      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+32 ZZ IDIOM 18 MEMORYSINK lea     rcx, [f+20h] 
     45f3cf      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+24 ZZ IDIOM 18 MEMORYSINK lea     rdx, [f+18h] 
-    45f3d3      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R11+28 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r11+1Ch]  ; http_error 
+    45f3d3      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R11+28 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r11+1Ch] 
     45f5c8      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+-1 ZZ IDIOM 32 lea     rsi, [rcx-1] 
     45f795      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+32 ZZ IDIOM 18 MEMORYSINK lea     rcx, [f+20h] 
     45f799      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+24 ZZ IDIOM 18 MEMORYSINK lea     rdx, [f+18h] 
-    45f79d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R11+28 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r11+1Ch]  ; http_error 
+    45f79d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R11+28 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r11+1Ch] 
     45f8b8      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+32 ZZ IDIOM 18 MEMORYSINK lea     rcx, [f+20h] 
     45f8bc      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+24 ZZ IDIOM 18 MEMORYSINK lea     rdx, [f+18h] 
-    45f8c0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R11+28 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r11+1Ch]  ; http_error 
+    45f8c0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R11+28 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r11+1Ch] 
     45fee0     81 FUNC RETURNTYPE RAX 4
     45fee0     81 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     45ff40   2561 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-less.psexe.infoannot b/tests/commit/save-less.psexe.infoannot
index a10f2e2c..655070aa 100644
--- a/tests/commit/save-less.psexe.infoannot
+++ b/tests/commit/save-less.psexe.infoannot
@@ -976,6 +976,9 @@
     4153e0      2 FUNC INARGS    4  ARG0 1 ARG1 0 ARG2 0 ARG3 1 
     4153f0    102 FUNC RETURNTYPE RAX 1
     4153f0    102 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    415460    137 FUNC RETURNTYPE RAX 0
+    415460    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    415460    137 FUNC PROBLEM init CALLUNRESOLVED 
     4154f0      2 FUNC RETURNTYPE RAX 0
     4154f0      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
     415500     54 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-ls-64bit.psexe.infoannot b/tests/commit/save-ls-64bit.psexe.infoannot
index 804473ea..ff8545b9 100644
--- a/tests/commit/save-ls-64bit.psexe.infoannot
+++ b/tests/commit/save-ls-64bit.psexe.infoannot
@@ -638,6 +638,9 @@
     411650     64 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     411690    101 FUNC RETURNTYPE RAX 0
     411690    101 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    411700    137 FUNC RETURNTYPE RAX 0
+    411700    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    411700    137 FUNC PROBLEM init CALLUNRESOLVED 
     411790      2 FUNC RETURNTYPE RAX 0
     411790      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
     4117a0     26 FUNC RETURNTYPE RAX 4
diff --git a/tests/commit/save-lt-svn.psexe.infoannot b/tests/commit/save-lt-svn.psexe.infoannot
index 4bdc14c9..621baa08 100644
--- a/tests/commit/save-lt-svn.psexe.infoannot
+++ b/tests/commit/save-lt-svn.psexe.infoannot
@@ -603,8 +603,8 @@
     40a3e0   5383 FUNC RETURNTYPE RAX 96
     40a3e0   5383 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
     40a718      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     rcx, [b+10h] 
-    40a71c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [b+8]      ; pool 
-    40b7e0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [b+8]      ; pool 
+    40a71c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [b+8] 
+    40b7e0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [b+8] 
     40b8f0   1068 FUNC RETURNTYPE RAX 96
     40b8f0   1068 FUNC INARGS    3  ARG0 0 ARG1 4 ARG2 0 
     40b991      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, 1 
@@ -655,17 +655,17 @@
     40dbc0   1893 FUNC RETURNTYPE RAX 1
     40dbc0   1893 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     40dc01      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+32 ZZ IDIOM 18 MEMORYSINK lea     original_start, [rdi+20h]; new_current_line 
-    40dc8c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [b+28h]    ; new_current_line 
-    40e111      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0Ch        ; editor_cmd 
-    40e1ab      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 0Ch        ; result_pool 
-    40e1be      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+24 ZZ lea     rdx, [rax+18h]  ; config 
-    40e1c2      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+12 ZZ lea     rsi, [rax+0Ch]  ; editor_cmd 
+    40dc8c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [b_0+28h]  ; new_current_line 
+    40e111      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0Ch 
+    40e1ab      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 0Ch 
+    40e1be      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+24 ZZ lea     rdx, [rax+18h] 
+    40e1c2      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+12 ZZ lea     rsi, [rax+0Ch] 
     40e21c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, [rax+0Ch] 
     40e265      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, [rax+0Ch] 
     40e303      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+24 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rdx+18h] 
     40e307      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDI+24 ZZ lea     rsi, [rdi+18h] 
     40e30b      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, 0Ch 
-    40e30f      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 0Ch        ; result_pool 
+    40e30f      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 0Ch 
     40e330   1073 FUNC RETURNTYPE RAX 0
     40e330   1073 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     40e770   1019 FUNC RETURNTYPE RAX 0
@@ -695,13 +695,13 @@
     411280   1514 FUNC RETURNTYPE RAX 1
     411280   1514 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     411280   1514 FUNC PROBLEM log_entry_receiver_xml CALLUNRESOLVED 
-    411330      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDI+24 ZZ lea     rsi, [rdi+18h]  ; date 
-    411344      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 0Ch        ; author 
+    411330      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDI+24 ZZ lea     rsi, [rdi+18h] 
+    411344      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 0Ch 
     411870   1824 FUNC RETURNTYPE RAX 4
     411870   1824 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     411870   1824 FUNC PROBLEM log_entry_receiver CALLUNRESOLVED 
-    41199e      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDI+24 ZZ lea     rsi, [rdi+18h]  ; date 
-    4119b2      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 0Ch        ; author 
+    41199e      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDI+24 ZZ lea     rsi, [rdi+18h] 
+    4119b2      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 0Ch 
     411e5c      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+-1 ZZ lea     rdx, [rax-1] 
     411e93      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+16 ZZ IDIOM 18 MEMORYSINK lea     rdx, [lb+10h] 
     411f90   1749 FUNC RETURNTYPE RAX 96
diff --git a/tests/commit/save-nginx.psexe.infoannot b/tests/commit/save-nginx.psexe.infoannot
index 4b0985cf..c488bb41 100644
--- a/tests/commit/save-nginx.psexe.infoannot
+++ b/tests/commit/save-nginx.psexe.infoannot
@@ -927,15 +927,15 @@
     410eb8      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 1          ; size 
     410eea      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, 1          ; n 
     410f0d      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+384 ZZ IDIOM 18 MEMORYSINK lea     rsi, [old_cycle+180h]; src 
-    410f4f      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX*8 ZZ lea     rsi, ds:0[n*8]  ; size 
-    410fcf      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX*4 ZZ lea     rsi, [rbx+rbx*4] 
-    410fcf      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX*4 ZZ lea     rsi, [rbx+rbx*4] 
-    411065      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX*8 ZZ lea     rsi, [rbx+rbx*8] 
-    411065      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX*8 ZZ lea     rsi, [rbx+rbx*8] 
-    4110d6      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX*4 ZZ lea     rsi, [rbx+rax*4] 
-    4110d6      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX*4 ZZ lea     rsi, [rbx+rax*4] 
+    410f4f      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX*8 ZZ lea     rsi, ds:0[n_0*8]; size 
+    410fcf      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX*4 ZZ lea     rsi, [n_0+n_0*4] 
+    410fcf      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX*4 ZZ lea     rsi, [n_0+n_0*4] 
+    411065      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX*8 ZZ lea     rsi, [n_0+n_0*8] 
+    411065      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RBX*8 ZZ lea     rsi, [n_0+n_0*8] 
+    4110d6      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX*4 ZZ lea     rsi, [n_0+rax*4] 
+    4110d6      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX*4 ZZ lea     rsi, [n_0+rax*4] 
     4111e4      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+-1 ZZ IDIOM 32 lea     rsi, [rcx-1]    ; size 
-    411368      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+368 ZZ IDIOM 18 MEMORYSINK lea     rsi, [cycle+170h]; filename 
+    411368      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+368 ZZ IDIOM 18 MEMORYSINK lea     rsi, [cycle_0+170h]; filename 
     41145a      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+136 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+88h]  ; name 
     4114a8      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+136 ZZ IDIOM 18 MEMORYSINK lea     rdi, [ccf+88h]  ; name 
     4116d1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+24 ZZ IDIOM 18 MEMORYSINK lea     r8, [rbx+18h] 
@@ -1077,8 +1077,8 @@
     414f31    317 FUNC RETURNTYPE RAX 0
     414f31    317 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     414f5c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+28h]  ; node 
-    415035      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+240 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r12+0F0h] ; queue 
-    41503d      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+80 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+50h]  ; tree 
+    415035      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+240 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r_0+0F0h] ; queue 
+    41503d      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+80 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r_0+50h]  ; tree 
     41506e    391 FUNC RETURNTYPE RAX 1
     41506e    391 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     4150ca      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+28h]  ; node 
@@ -1210,7 +1210,7 @@
     419761      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+16 ZZ IDIOM 18 MEMORYSINK lea     r8, [value+10h] 
     4197b2    202 FUNC RETURNTYPE RAX 96
     4197b2    202 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-    41982f      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+16 ZZ IDIOM 18 MEMORYSINK lea     r8, [r12+10h] 
+    41982f      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+16 ZZ IDIOM 18 MEMORYSINK lea     r8, [p_value_0+10h] 
     41987c    671 FUNC RETURNTYPE RAX 96
     41987c    671 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
     41987c    671 FUNC PROBLEM ngx_events_block CALLUNRESOLVED 
@@ -1829,7 +1829,7 @@
     42aa7c    158 FUNC RETURNTYPE RAX 16
     42aa7c    158 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
     42aaab      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+16 ZZ lea     cf_0, [r12+10h] ; line 
-    42aadf      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+32 ZZ lea     rdi, [r12+20h]  ; line 
+    42aadf      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+32 ZZ lea     rdi, [value_0+20h]; line 
     42ab1a    486 FUNC RETURNTYPE RAX 96
     42ab1a    486 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
     42aba4      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RSI ZZ sub     rsi, 4          ; n 
@@ -2055,8 +2055,8 @@
     432275    702 FUNC RETURNTYPE RAX 96
     432275    702 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     432275    702 FUNC PROBLEM ngx_http_init_connection CALLUNRESOLVED 
-    4324df      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+28h]  ; node 
-    4324f5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+28h]  ; node 
+    4324df      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rev_0+28h]; node 
+    4324f5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rev_0+28h]; node 
     432533    718 FUNC RETURNTYPE RAX 4
     432533    718 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
     432801    591 FUNC RETURNTYPE RAX 1
@@ -2801,7 +2801,7 @@
     44334e      3 INSTR CHECK OVERFLOW SIGNED 64  RDX ZZ neg     rdx 
     4433bc    506 FUNC RETURNTYPE RAX 1
     4433bc    506 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-    44342e      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+520 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+208h] ; a 
+    44342e      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+520 ZZ IDIOM 18 MEMORYSINK lea     rdi, [u_0+208h] ; a 
     44352d      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+-48 ZZ IDIOM 32 lea     esi, [rax-30h] 
     4435b6    423 FUNC RETURNTYPE RAX 96
     4435b6    423 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -2962,7 +2962,7 @@
     449420      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+848 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r+350h]   ; args 
     44956e      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+848 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r+350h]   ; args 
     449991      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [r+340h]   ; dest 
-    449998      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+-1 ZZ lea     rdx, [r12-1]    ; n 
+    449998      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+-1 ZZ lea     rdx, [p_len_0-1]; n 
     4499a5      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+848 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r+350h]   ; args 
     449a18     56 FUNC RETURNTYPE RAX 1
     449a18     56 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
@@ -3085,7 +3085,7 @@
     44c39e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+10h]  ; src 
     44c3b5      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+1 ZZ lea     edx, [rax+1] 
     44c3d0      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 50h        ; mtx 
-    44c3dd      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, [r12+10h] 
+    44c3dd      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, [path_0+10h] 
     44c3e2      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, 21h        ; len 
     44c437      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 50h        ; mtx 
     44c4b0    214 FUNC RETURNTYPE RAX 1
@@ -3371,7 +3371,7 @@
     4545eb      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ add     rdx, rax 
     4545ee      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ add     rdx, r12        ; size 
     454937      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [ctx+38h]  ; dest 
-    454955      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDX ZZ sub     rdx, [rbx] 
+    454955      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDX ZZ sub     rdx, [p_b_0] 
     454a22      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 23 sub     rdx, rax 
     454a72      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, rax 
     454d31    117 FUNC RETURNTYPE RAX 1
@@ -3459,11 +3459,11 @@
     45672b      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 13h        ; src 
     456741      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 13h        ; src 
     456972      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+54 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+36h]  ; dst 
-    4569ac      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [r+340h] 
+    4569ac      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [r_0+340h] 
     456a0c      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 36h        ; dest 
     456b47      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, 30h        ; n 
     456b4b      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, 1          ; len 
-    456b69      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, last       ; size 
+    456b69      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, last_0     ; size 
     456c52      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX*4 ZZ lea     rdx, ds:0[rax*4] 
     456c69      5 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 CONST 0 imul    rdi, [rdx+8] 
     456c6e      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, [rbx+30h]  ; t 
@@ -3535,7 +3535,7 @@
     4580f7      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+24 ZZ IDIOM 18 MEMORYSINK lea     rdx, [shm_zone+18h] 
     458142    130 FUNC RETURNTYPE RAX 4
     458142    130 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-    458183      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+36 ZZ IDIOM 18 MEMORYSINK lea     rsi, [temp+24h] ; s2 
+    458183      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+36 ZZ IDIOM 18 MEMORYSINK lea     rsi, [temp_0+24h]; s2 
     4581c4    739 FUNC RETURNTYPE RAX 1
     4581c4    739 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     458271      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, r15 
@@ -3545,7 +3545,7 @@
     4584a7    123 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
     458522    947 FUNC RETURNTYPE RAX 1
     458522    947 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-    4585ed      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+16 ZZ IDIOM 18 MEMORYSINK lea     r8, [ctx+10h] 
+    4585ed      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+16 ZZ IDIOM 18 MEMORYSINK lea     r8, [ctx_0+10h] 
     4586d8      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+36 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+24h]  ; s2 
     45871e      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, 24h        ; size 
     45879b      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+36 ZZ IDIOM 18 MEMORYSINK lea     rdi, [node+24h] ; dest 
@@ -3582,7 +3582,7 @@
     459193      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+24 ZZ IDIOM 18 MEMORYSINK lea     rdx, [shm_zone+18h] 
     4591dd    130 FUNC RETURNTYPE RAX 4
     4591dd    130 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-    45921e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+80 ZZ IDIOM 18 MEMORYSINK lea     rsi, [temp+50h] ; s2 
+    45921e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+80 ZZ IDIOM 18 MEMORYSINK lea     rsi, [temp_0+50h]; s2 
     45925f    331 FUNC RETURNTYPE RAX 96
     45925f    331 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     4592b1      4 INSTR CHECK OVERFLOW UNSIGNED 64  RAX ZZ IDIOM 18 MEMORYSINK add     rax, 40h 
@@ -3755,8 +3755,8 @@
     45e862      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+16 ZZ IDIOM 18 MEMORYSINK lea     r8, [value+10h] 
     45e8e6   1159 FUNC RETURNTYPE RAX 1
     45e8e6   1159 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-    45eb80      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+48 ZZ IDIOM 18 MEMORYSINK lea     r8, [rbx+30h] 
-    45ebc0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+32 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+20h]  ; value 
+    45eb80      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+48 ZZ IDIOM 18 MEMORYSINK lea     r8, [p_value_0+30h] 
+    45ebc0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+32 ZZ IDIOM 18 MEMORYSINK lea     rdi, [p_value_0+20h]; value 
     45ed70     19 FUNC RETURNTYPE RAX 1
     45ed70     19 FUNC INARGS    4  ARG0 0 ARG1 4 ARG2 4 ARG3 0 
     45ed83    110 FUNC RETURNTYPE RAX 1
@@ -3918,8 +3918,8 @@
     461876    490 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
     4618de      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     r8, [rbx+10h] 
     46197e      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDX ZZ sub     rdx, 1 
-    46198e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+10h]  ; regex 
-    4619b3      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+10h]  ; regex 
+    46198e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     rdx, [value_0+10h]; regex 
+    4619b3      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     rdx, [value_0+10h]; regex 
     461a60    445 FUNC RETURNTYPE RAX 1
     461a60    445 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
     461abd      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+16 ZZ IDIOM 18 MEMORYSINK lea     r8, [rbp+10h] 
@@ -3927,11 +3927,11 @@
     461b52      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+16 ZZ IDIOM 18 MEMORYSINK lea     rdx, [value+10h]; regex 
     461c1d   1036 FUNC RETURNTYPE RAX 1
     461c1d   1036 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-    461d15      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+16 ZZ IDIOM 18 MEMORYSINK lea     r8, [r12+10h] 
+    461d15      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+16 ZZ IDIOM 18 MEMORYSINK lea     r8, [value_0+10h] 
     461ebd      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 1          ; size 
     461f3f      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDX ZZ sub     rdx, 1 
-    461f51      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+16 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r12+10h]  ; regex 
-    461f7a      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+16 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r12+10h]  ; regex 
+    461f51      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+16 ZZ IDIOM 18 MEMORYSINK lea     rdx, [value_0+10h]; regex 
+    461f7a      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+16 ZZ IDIOM 18 MEMORYSINK lea     rdx, [value_0+10h]; regex 
     462029    737 FUNC RETURNTYPE RAX 96
     462029    737 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
     46222f      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+584 ZZ IDIOM 18 MEMORYSINK lea     rsi, [plcf+248h]; v 
@@ -3945,7 +3945,7 @@
     4628b8   2394 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     4628b8   2394 FUNC PROBLEM ngx_http_proxy_create_request CALLUNRESOLVED 
     462a3e      5 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, [rsp+148h+loc_len]; size 
-    462a48      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, [r+348h]   ; src 
+    462a48      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, [r_0+348h] ; src 
     462d9c      5 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, [rsp+148h+loc_len]; size 
     462da6      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, [rbp+348h] ; src 
     462ddd      5 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, [rsp+148h+loc_len]; n 
@@ -4052,7 +4052,7 @@
     466049      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     flcf, 148h 
     46607c    283 FUNC RETURNTYPE RAX 1
     46607c    283 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-    466138      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     r8, [rbx+10h] 
+    466138      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     r8, [value_0+10h] 
     466197    369 FUNC RETURNTYPE RAX 96
     466197    369 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
     466308    811 FUNC RETURNTYPE RAX 1
@@ -4062,9 +4062,9 @@
     466633   2839 FUNC PROBLEM ngx_http_fastcgi_create_request CALLUNRESOLVED 
     4667c3      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX*8 ZZ lea     rsi, ds:0[rdx*8]; size 
     4669d7      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, rax 
-    4669f1      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+RAX ZZ lea     rsi, [rcx+rax+28h]; size 
-    4669f1      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+RAX+40 ZZ lea     rsi, [rcx+rax+28h]; size 
-    467021      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+8 ZZ lea     rsi, [r13+8]    ; size 
+    4669f1      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+RAX ZZ lea     rsi, [rcx+padding_0+28h]; size 
+    4669f1      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+RAX+40 ZZ lea     rsi, [rcx+padding_0+28h]; size 
+    467021      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+8 ZZ lea     rsi, [padding_0+8]; size 
     46714a   3580 FUNC RETURNTYPE RAX 1
     46714a   3580 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
     467501      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+192 ZZ IDIOM 18 MEMORYSINK lea     rsi, [conf+0C0h]; path 
@@ -4117,7 +4117,7 @@
     4686b3      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     uwcf, 148h 
     4686e6    498 FUNC RETURNTYPE RAX 96
     4686e6    498 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-    468846      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     add, [r12+18h] 
+    468846      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     add, [value_0+18h] 
     4688d8   1017 FUNC RETURNTYPE RAX 1
     4688d8   1017 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     468cd1   1922 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-synaptic.psexe.infoannot b/tests/commit/save-synaptic.psexe.infoannot
index 36c7c0b0..68b1e5a0 100644
--- a/tests/commit/save-synaptic.psexe.infoannot
+++ b/tests/commit/save-synaptic.psexe.infoannot
@@ -2558,7 +2558,7 @@
     43a250    880 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
     43a5c0    126 FUNC RETURNTYPE RAX 0
     43a5c0    126 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-    43a625      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBP 32 EBP ZZ mov     esi, ebp        ; int 
+    43a625      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBP 32 EBP ZZ mov     esi, ebp 
     43a970    339 FUNC RETURNTYPE RAX 1
     43a970    339 FUNC INARGS    1  ARG0 4 
     43a970    339 FUNC PROBLEM sub_43A970 CALLUNRESOLVED 
@@ -4495,6 +4495,9 @@
     491422      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+144 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+90h] 
     491520    298 FUNC RETURNTYPE RAX 0
     491520    298 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    491650    137 FUNC RETURNTYPE RAX 0
+    491650    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    491650    137 FUNC PROBLEM init CALLUNRESOLVED 
     4916e0      2 FUNC RETURNTYPE RAX 0
     4916e0      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
     4916f0     54 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-xedit.psexe.infoannot b/tests/commit/save-xedit.psexe.infoannot
index d33012de..02b9f549 100644
--- a/tests/commit/save-xedit.psexe.infoannot
+++ b/tests/commit/save-xedit.psexe.infoannot
@@ -38,6 +38,8 @@
     403e40      6 FUNC PROBLEM .strcpy JUMPUNRESOLVED 
     403e50      6 FUNC RETURNTYPE RAX 0
     403e50      6 FUNC PROBLEM .XLookupString JUMPUNRESOLVED 
+    403e60      6 FUNC RETURNTYPE RAX 0
+    403e60      6 FUNC PROBLEM .XmuDestroySegmentList JUMPUNRESOLVED 
     403e70      6 FUNC RETURNTYPE RAX 0
     403e70      6 FUNC PROBLEM .puts JUMPUNRESOLVED 
     403e80      6 FUNC RETURNTYPE RAX 0
@@ -76,6 +78,8 @@
     403f80      6 FUNC PROBLEM .XawTextLastPosition JUMPUNRESOLVED 
     403f90      6 FUNC RETURNTYPE RAX 0
     403f90      6 FUNC PROBLEM .XtMalloc JUMPUNRESOLVED 
+    403fa0      6 FUNC RETURNTYPE RAX 0
+    403fa0      6 FUNC PROBLEM ._XawTextNeedsUpdating JUMPUNRESOLVED 
     403fb0      6 FUNC RETURNTYPE RAX 0
     403fb0      6 FUNC PROBLEM .XtAppAddTimeOut JUMPUNRESOLVED 
     403fc0      6 FUNC RETURNTYPE RAX 0
@@ -100,6 +104,8 @@
     404050      6 FUNC PROBLEM .strlen JUMPUNRESOLVED 
     404060      6 FUNC RETURNTYPE RAX 0
     404060      6 FUNC PROBLEM .XtName JUMPUNRESOLVED 
+    404070      6 FUNC RETURNTYPE RAX 0
+    404070      6 FUNC PROBLEM .XawTextSourceNextAnchor JUMPUNRESOLVED 
     404080      6 FUNC RETURNTYPE RAX 0
     404080      6 FUNC PROBLEM .XawTextDisplay JUMPUNRESOLVED 
     404090      6 FUNC RETURNTYPE RAX 0
@@ -126,6 +132,8 @@
     404130      6 FUNC PROBLEM .XtVaCreateManagedWidget JUMPUNRESOLVED 
     404140      6 FUNC RETURNTYPE RAX 0
     404140      6 FUNC PROBLEM .strrchr JUMPUNRESOLVED 
+    404150      6 FUNC RETURNTYPE RAX 0
+    404150      6 FUNC PROBLEM .XmuScanlineXor JUMPUNRESOLVED 
     404160      6 FUNC RETURNTYPE RAX 0
     404160      6 FUNC PROBLEM .dirname JUMPUNRESOLVED 
     404170      6 FUNC RETURNTYPE RAX 0
@@ -190,6 +198,8 @@
     404340      6 FUNC PROBLEM .XtSetSensitive JUMPUNRESOLVED 
     404350      6 FUNC RETURNTYPE RAX 0
     404350      6 FUNC PROBLEM .signal JUMPUNRESOLVED 
+    404360      6 FUNC RETURNTYPE RAX 0
+    404360      6 FUNC PROBLEM .XawTextSourceAnchorAndEntity JUMPUNRESOLVED 
     404370      6 FUNC RETURNTYPE RAX 0
     404370      6 FUNC PROBLEM .getpwnam JUMPUNRESOLVED 
     404380      6 FUNC RETURNTYPE RAX 0
@@ -220,6 +230,8 @@
     404440      6 FUNC PROBLEM .XQueryPointer JUMPUNRESOLVED 
     404450      6 FUNC RETURNTYPE RAX 0
     404450      6 FUNC PROBLEM .XtOverrideTranslations JUMPUNRESOLVED 
+    404460      6 FUNC RETURNTYPE RAX 0
+    404460      6 FUNC PROBLEM .XmuScanlineAnd JUMPUNRESOLVED 
     404470      6 FUNC RETURNTYPE RAX 0
     404470      6 FUNC PROBLEM .kill JUMPUNRESOLVED 
     404480      6 FUNC RETURNTYPE RAX 0
@@ -270,6 +282,8 @@
     4045e0      6 FUNC PROBLEM .__strcpy_chk JUMPUNRESOLVED 
     4045f0      6 FUNC RETURNTYPE RAX 0
     4045f0      6 FUNC PROBLEM .setitimer JUMPUNRESOLVED 
+    404600      6 FUNC RETURNTYPE RAX 0
+    404600      6 FUNC PROBLEM .XmuNewScanline JUMPUNRESOLVED 
     404610      6 FUNC RETURNTYPE RAX 0
     404610      6 FUNC PROBLEM .XtSetKeyboardFocus JUMPUNRESOLVED 
     404620      6 FUNC RETURNTYPE RAX 0
@@ -324,6 +338,8 @@
     4047a0      6 FUNC PROBLEM .XtAppAddInput JUMPUNRESOLVED 
     4047b0      6 FUNC RETURNTYPE RAX 0
     4047b0      6 FUNC PROBLEM .floor JUMPUNRESOLVED 
+    4047c0      6 FUNC RETURNTYPE RAX 0
+    4047c0      6 FUNC PROBLEM .XawTextSourceFindAnchor JUMPUNRESOLVED 
     4047d0      6 FUNC RETURNTYPE RAX 0
     4047d0      6 FUNC PROBLEM .creat JUMPUNRESOLVED 
     4047e0      6 FUNC RETURNTYPE RAX 0
@@ -334,10 +350,14 @@
     404800      6 FUNC PROBLEM .__memset_chk JUMPUNRESOLVED 
     404810      6 FUNC RETURNTYPE RAX 0
     404810      6 FUNC PROBLEM .exit JUMPUNRESOLVED 
+    404820      6 FUNC RETURNTYPE RAX 0
+    404820      6 FUNC PROBLEM .XmuScanlineOrSegment JUMPUNRESOLVED 
     404830      6 FUNC RETURNTYPE RAX 0
     404830      6 FUNC PROBLEM .fwrite JUMPUNRESOLVED 
     404840      6 FUNC RETURNTYPE RAX 0
     404840      6 FUNC PROBLEM .XawListUnhighlight JUMPUNRESOLVED 
+    404850      6 FUNC RETURNTYPE RAX 0
+    404850      6 FUNC PROBLEM .XmuOptimizeScanline JUMPUNRESOLVED 
     404860      6 FUNC RETURNTYPE RAX 0
     404860      6 FUNC PROBLEM .__fprintf_chk CHUNKS JUMPUNRESOLVED 
     404870      6 FUNC RETURNTYPE RAX 0
@@ -1029,7 +1049,7 @@
     4222b0    106 FUNC RETURNTYPE RAX 96
     4222b0    106 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     422320     76 FUNC RETURNTYPE RAX 96
-    422320     76 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 96 ARG3 96 ARG4 4 ARG5 4 
+    422320     76 FUNC INARGS    6  ARG0 96 ARG1 96 ARG2 96 ARG3 96 ARG4 4 ARG5 4 
     422370    238 FUNC RETURNTYPE RAX 96
     422370    238 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     42240a      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 1 
@@ -1653,6 +1673,8 @@
     446bf9      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+RBP ZZ IDIOM 18 MEMORYSINK lea     rsi, [r13+rbp+1]; src 
     446bf9      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+RBP+1 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r13+rbp+1]; src 
     446c4d      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RBP+-2 ZZ IDIOM 19 lea     esi, [rbp-2] 
+    448a30    287 FUNC RETURNTYPE RAX 0
+    448a30    287 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     448b50     71 FUNC RETURNTYPE RAX 1
     448b50     71 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     448ba0    232 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-xeyes.psexe.infoannot b/tests/commit/save-xeyes.psexe.infoannot
index 404fa3e4..5b3208a6 100644
--- a/tests/commit/save-xeyes.psexe.infoannot
+++ b/tests/commit/save-xeyes.psexe.infoannot
@@ -140,6 +140,9 @@
     402fe0     77 FUNC INARGS    5  ARG0 4 ARG1 1 ARG2 1 ARG3 1 ARG4 1 
     403030     61 FUNC RETURNTYPE RAX 0
     403030     61 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    403070    137 FUNC RETURNTYPE RAX 0
+    403070    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    403070    137 FUNC PROBLEM init CALLUNRESOLVED 
     403100      2 FUNC RETURNTYPE RAX 0
     403100      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
     403110     54 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/trimmed-sorted-save-busybox.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-busybox.psexe.annot.REMOVED.git-id
index cc0c6276..3b0cf056 100644
--- a/tests/commit/trimmed-sorted-save-busybox.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-busybox.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-56c3f3a38be5e2dd27db65b32dbe97bd1be7a608
\ No newline at end of file
+8cfeee8defcca6bd3f6163aea83185c68d18f064
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-bzip2.psexe.annot b/tests/commit/trimmed-sorted-save-bzip2.psexe.annot
index db328f78..b9244fe3 100644
--- a/tests/commit/trimmed-sorted-save-bzip2.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-bzip2.psexe.annot
@@ -1829,9 +1829,9 @@
     401e03     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     401e03      7 INSTR BELONGTO 401df4 
     401e03      7 INSTR DEADREGS  EFLAGS ECX EDI R8 ZZ mov     r8, offset fini ; fini 
-    401e0a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; "H‰l$ØL‰d$àH-Ã( " 
+    401e0a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; init 
     401e0a      7 INSTR BELONGTO 401df4 
-    401e0a      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; "H‰l$ØL‰d$àH-Ã( " 
+    401e0a      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; init 
     401e11     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, offset main; main 
     401e11      7 INSTR BELONGTO 401df4 
     401e11      7 INSTR DEADREGS  EFLAGS EDI ZZ mov     rdi, offset main; main 
@@ -7016,26 +7016,95 @@
     404532     -1 INSTR LOCAL NoMetaUpdate call    sub_4023C0 
     404532      5 INSTR BELONGTO 403ef0 
     404532      5 INSTR DEADREGS  EFLAGS EAX ECX EDX EBX ESI R8 ZZ call    sub_4023C0 
-    404558      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], r13
-    40455d      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r14
-    404562      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r15
-    404567      5 PTRIMMEDESP STACK -48 displ mov     [rsp-30h], rbx
-    404579     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
+    404540      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+    404540      0 FUNC MMSAFENESS SPECSAFE
+    404540    137 FUNC GLOBAL init FUNC_UNSAFE NOFP RET     4045c8 
+    404540      5 INSTR BELONGTO 404540 
+    404540      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_28], rbp 
+    404540      5 PTRIMMEDESP STACK -40 displ mov     [rsp+var_28], rbp
+    404545      5 INSTR BELONGTO 404540 
+    404545      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
+    404545      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
+    40454a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:606E14h 
+    40454a      7 INSTR BELONGTO 404540 
+    404551      7 INSTR BELONGTO 404540 
+    404551      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     r12, cs:606E14h 
+    404558      5 INSTR BELONGTO 404540 
+    404558      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_18], r13 
+    404558      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], r13
+    40455d      5 INSTR BELONGTO 404540 
+    40455d      5 INSTR DEADREGS  EFLAGS R13 ZZ mov     [rsp+var_10], r14 
+    40455d      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], r14
+    404562      5 INSTR BELONGTO 404540 
+    404562      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ mov     [rsp+var_8], r15 
+    404562      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
+    404567      5 INSTR BELONGTO 404540 
+    404567      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ mov     [rsp+var_30], rbx 
+    404567      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
+    40456c      4 INSTR BELONGTO 404540 
+    40456c      4 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ sub     rsp, 38h 
+    40456c     56 DATAREF STACK 371 esp + 0 PARENT LocalFrame LOCALFRAME
+    40456c      8 DATAREF STACK 372 esp + 8 CHILDOF 371 OFFSET 8 LOCALVAR var_30 
+    40456c      8 DATAREF STACK 373 esp + 16 CHILDOF 371 OFFSET 16 LOCALVAR var_28 
+    40456c      8 DATAREF STACK 374 esp + 24 CHILDOF 371 OFFSET 24 LOCALVAR var_20 
+    40456c      8 DATAREF STACK 375 esp + 32 CHILDOF 371 OFFSET 32 LOCALVAR var_18 
+    40456c      8 DATAREF STACK 376 esp + 40 CHILDOF 371 OFFSET 40 LOCALVAR var_10 
+    40456c      8 DATAREF STACK 377 esp + 48 CHILDOF 371 OFFSET 48 LOCALVAR var_8 
+    40456c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
+    404570     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
+    404570      3 INSTR BELONGTO 404540 
+    404573      3 INSTR BELONGTO 404540 
+    404573      3 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ mov     r13d, edi 
+    404576      3 INSTR BELONGTO 404540 
+    404576      3 INSTR DEADREGS  EFLAGS EBX R14 R15 ZZ mov     r14, rsi 
+    404579     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+    404579      4 INSTR BELONGTO 404540 
+    40457d      3 INSTR BELONGTO 404540 
+    40457d      3 INSTR DEADREGS  EFLAGS EBX R15 ZZ mov     r15, rdx 
     404580     -1 INSTR LOCAL NoMetaUpdate call    _init_proc 
+    404580      5 INSTR BELONGTO 404540 
+    404580      5 INSTR DEADREGS  EFLAGS EBX ZZ call    _init_proc 
     404585     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
+    404585      3 INSTR BELONGTO 404540 
     404588     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4045A6 
+    404588      2 INSTR BELONGTO 404540 
+    40458a      2 INSTR BELONGTO 404540 
+    40458a      2 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ xor     ebx, ebx 
     40458a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+    40458c      4 INSTR BELONGTO 404540 
+    404590      3 INSTR BELONGTO 404540 
+    404590      3 INSTR DEADREGS  EFLAGS EDX ESI EDI ZZ mov     rdx, r15 
+    404593      3 INSTR BELONGTO 404540 
+    404593      3 INSTR DEADREGS  EFLAGS ESI EDI ZZ mov     rsi, r14 
+    404596      3 INSTR BELONGTO 404540 
+    404596      3 INSTR DEADREGS  EFLAGS EDI ZZ mov     edi, r13d 
     404599     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [r12+rbx*8] 
+    404599      4 INSTR BELONGTO 404540 
     40459d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbx, 1 
+    40459d      4 INSTR BELONGTO 404540 
     4045a1     -1 INSTR LOCAL NoMetaUpdate cmp     rbx, rbp 
+    4045a1      3 INSTR BELONGTO 404540 
     4045a4     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_404590 
-    4045a6      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
-    4045ab      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
-    4045b0      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
-    4045b5      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
-    4045ba      5 PTRIMMEDESP STACK 40 displ mov     r14, [rsp+28h]
-    4045bf      5 PTRIMMEDESP STACK 48 displ mov     r15, [rsp+30h]
+    4045a4      2 INSTR BELONGTO 404540 
+    4045a6      5 INSTR BELONGTO 404540 
+    4045a6      5 INSTR DEADREGS  EFLAGS EBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbx, [rsp+38h+var_30] 
+    4045a6      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+38h+var_30]
+    4045ab      5 INSTR BELONGTO 404540 
+    4045ab      5 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbp, [rsp+38h+var_28] 
+    4045ab      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+38h+var_28]
+    4045b0     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+38h+var_20] 
+    4045b0      5 INSTR BELONGTO 404540 
+    4045b5     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+38h+var_18] 
+    4045b5      5 INSTR BELONGTO 404540 
+    4045ba     -1 INSTR LOCAL MetadataUnused mov     r14, [rsp+38h+var_10] 
+    4045ba      5 INSTR BELONGTO 404540 
+    4045bf     -1 INSTR LOCAL MetadataUnused mov     r15, [rsp+38h+var_8] 
+    4045bf      5 INSTR BELONGTO 404540 
     4045c4     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
+    4045c4      4 INSTR BELONGTO 404540 
+    4045c8      1 INSTR BELONGTO 404540 
+    4045c8      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
+    4045c8     56 DEALLOC STACK esp - 56 retn
     4045d0      0 FUNC FRAMERESTORE 0 0 0 1 0 1 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     4045d0      0 FUNC MMSAFENESS SAFE
     4045d0      2 FUNC GLOBAL fini FUNC_SAFE NOFP RET FUNC_LEAF     4045d1 
@@ -7056,7 +7125,7 @@
     4045e4     -3 INSTR LOCAL NoWarn push    rbx 
     4045e5      4 INSTR BELONGTO 4045e0 
     4045e5      4 INSTR DEADREGS  EFLAGS EAX EBX ZZ sub     rsp, 8 
-    4045e5      8 DATAREF STACK 371 esp + 0 PARENT LocalFrame LOCALFRAME
+    4045e5      8 DATAREF STACK 378 esp + 0 PARENT LocalFrame LOCALFRAME
     4045e5      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     4045e5      8 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4045e9      7 INSTR BELONGTO 4045e0 
@@ -7092,7 +7161,7 @@
     404618     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     404625 
     404618      4 INSTR BELONGTO 404618 
     404618      4 INSTR DEADREGS  EFLAGS EAX ECX EDX ESI EDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    404618      8 DATAREF STACK 372 esp + 0 PARENT LocalFrame LOCALFRAME
+    404618      8 DATAREF STACK 379 esp + 0 PARENT LocalFrame LOCALFRAME
     404618      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40461c     -1 INSTR LOCAL NoMetaUpdate call    sub_401E40 
     40461c      5 INSTR BELONGTO 404618 
diff --git a/tests/commit/trimmed-sorted-save-ffmpeg.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-ffmpeg.psexe.annot.REMOVED.git-id
index 6ed6d19f..7203ecd3 100644
--- a/tests/commit/trimmed-sorted-save-ffmpeg.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-ffmpeg.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-026b8018fce7579f5bbe0fbd1e6bc17db7346eef
\ No newline at end of file
+d62e2c1bd2951c9a91d529770516e978b783a9fa
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-firefox-bin.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-firefox-bin.psexe.annot.REMOVED.git-id
index 3d76c1d2..b5cddc48 100644
--- a/tests/commit/trimmed-sorted-save-firefox-bin.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-firefox-bin.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-d2ca49f514fd93dbda786f50e40895267ea0b1fc
\ No newline at end of file
+7031316611101546573c295d6308cb30e7733318
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gimp.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gimp.psexe.annot.REMOVED.git-id
index a07b064e..e9200f1d 100644
--- a/tests/commit/trimmed-sorted-save-gimp.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gimp.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-20dcf8489c685c9cf967fdd6103c4b13400d6cc5
\ No newline at end of file
+9d4ea663d6a63e641af3bb1be02527971a22e367
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
index 0f11cb35..de0abc1d 100644
--- a/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
@@ -2781,9 +2781,9 @@
     406f3b     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     406f3b      7 INSTR BELONGTO 406f2c 
     406f3b      7 INSTR DEADREGS  EFLAGS ECX EDI R8 ZZ mov     r8, offset fini ; fini 
-    406f42     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; "H‰l$ØL‰d$àH-“1 " 
+    406f42     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; init 
     406f42      7 INSTR BELONGTO 406f2c 
-    406f42      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; "H‰l$ØL‰d$àH-“1 " 
+    406f42      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; init 
     406f49     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, offset main; main 
     406f49      7 INSTR BELONGTO 406f2c 
     406f49      7 INSTR DEADREGS  EFLAGS EDI ZZ mov     rdi, offset main; main 
@@ -11561,26 +11561,95 @@
     40bbbb     -1 INSTR LOCAL NoMetaUpdate call    _exit 
     40bbbb      5 INSTR BELONGTO 40bb90 
     40bbbb      5 INSTR DEADREGS  EFLAGS ZZ call    _exit 
-    40bbd8      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], r13
-    40bbdd      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r14
-    40bbe2      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r15
-    40bbe7      5 PTRIMMEDESP STACK -48 displ mov     [rsp-30h], rbx
-    40bbf9     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
+    40bbc0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+    40bbc0      0 FUNC MMSAFENESS SPECSAFE
+    40bbc0    137 FUNC GLOBAL init FUNC_UNSAFE NOFP RET     40bc48 
+    40bbc0      5 INSTR BELONGTO 40bbc0 
+    40bbc0      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_28], rbp 
+    40bbc0      5 PTRIMMEDESP STACK -40 displ mov     [rsp+var_28], rbp
+    40bbc5      5 INSTR BELONGTO 40bbc0 
+    40bbc5      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
+    40bbc5      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
+    40bbca     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:60ED64h 
+    40bbca      7 INSTR BELONGTO 40bbc0 
+    40bbd1      7 INSTR BELONGTO 40bbc0 
+    40bbd1      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     r12, cs:60ED64h 
+    40bbd8      5 INSTR BELONGTO 40bbc0 
+    40bbd8      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_18], r13 
+    40bbd8      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], r13
+    40bbdd      5 INSTR BELONGTO 40bbc0 
+    40bbdd      5 INSTR DEADREGS  EFLAGS R13 ZZ mov     [rsp+var_10], r14 
+    40bbdd      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], r14
+    40bbe2      5 INSTR BELONGTO 40bbc0 
+    40bbe2      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ mov     [rsp+var_8], r15 
+    40bbe2      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
+    40bbe7      5 INSTR BELONGTO 40bbc0 
+    40bbe7      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ mov     [rsp+var_30], rbx 
+    40bbe7      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
+    40bbec      4 INSTR BELONGTO 40bbc0 
+    40bbec      4 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ sub     rsp, 38h 
+    40bbec     56 DATAREF STACK 858 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bbec      8 DATAREF STACK 859 esp + 8 CHILDOF 858 OFFSET 8 LOCALVAR var_30 
+    40bbec      8 DATAREF STACK 860 esp + 16 CHILDOF 858 OFFSET 16 LOCALVAR var_28 
+    40bbec      8 DATAREF STACK 861 esp + 24 CHILDOF 858 OFFSET 24 LOCALVAR var_20 
+    40bbec      8 DATAREF STACK 862 esp + 32 CHILDOF 858 OFFSET 32 LOCALVAR var_18 
+    40bbec      8 DATAREF STACK 863 esp + 40 CHILDOF 858 OFFSET 40 LOCALVAR var_10 
+    40bbec      8 DATAREF STACK 864 esp + 48 CHILDOF 858 OFFSET 48 LOCALVAR var_8 
+    40bbec      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
+    40bbf0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
+    40bbf0      3 INSTR BELONGTO 40bbc0 
+    40bbf3      3 INSTR BELONGTO 40bbc0 
+    40bbf3      3 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ mov     r13d, edi 
+    40bbf6      3 INSTR BELONGTO 40bbc0 
+    40bbf6      3 INSTR DEADREGS  EFLAGS EBX R14 R15 ZZ mov     r14, rsi 
+    40bbf9     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+    40bbf9      4 INSTR BELONGTO 40bbc0 
+    40bbfd      3 INSTR BELONGTO 40bbc0 
+    40bbfd      3 INSTR DEADREGS  EFLAGS EBX R15 ZZ mov     r15, rdx 
     40bc00     -1 INSTR LOCAL NoMetaUpdate call    _init_proc 
+    40bc00      5 INSTR BELONGTO 40bbc0 
+    40bc00      5 INSTR DEADREGS  EFLAGS EBX ZZ call    _init_proc 
     40bc05     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
+    40bc05      3 INSTR BELONGTO 40bbc0 
     40bc08     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40BC26 
+    40bc08      2 INSTR BELONGTO 40bbc0 
+    40bc0a      2 INSTR BELONGTO 40bbc0 
+    40bc0a      2 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ xor     ebx, ebx 
     40bc0a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+    40bc0c      4 INSTR BELONGTO 40bbc0 
+    40bc10      3 INSTR BELONGTO 40bbc0 
+    40bc10      3 INSTR DEADREGS  EFLAGS EDX ESI EDI ZZ mov     rdx, r15 
+    40bc13      3 INSTR BELONGTO 40bbc0 
+    40bc13      3 INSTR DEADREGS  EFLAGS ESI EDI ZZ mov     rsi, r14 
+    40bc16      3 INSTR BELONGTO 40bbc0 
+    40bc16      3 INSTR DEADREGS  EFLAGS EDI ZZ mov     edi, r13d 
     40bc19     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [r12+rbx*8] 
+    40bc19      4 INSTR BELONGTO 40bbc0 
     40bc1d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbx, 1 
+    40bc1d      4 INSTR BELONGTO 40bbc0 
     40bc21     -1 INSTR LOCAL NoMetaUpdate cmp     rbx, rbp 
+    40bc21      3 INSTR BELONGTO 40bbc0 
     40bc24     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40BC10 
-    40bc26      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
-    40bc2b      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
-    40bc30      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
-    40bc35      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
-    40bc3a      5 PTRIMMEDESP STACK 40 displ mov     r14, [rsp+28h]
-    40bc3f      5 PTRIMMEDESP STACK 48 displ mov     r15, [rsp+30h]
+    40bc24      2 INSTR BELONGTO 40bbc0 
+    40bc26      5 INSTR BELONGTO 40bbc0 
+    40bc26      5 INSTR DEADREGS  EFLAGS EBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbx, [rsp+38h+var_30] 
+    40bc26      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+38h+var_30]
+    40bc2b      5 INSTR BELONGTO 40bbc0 
+    40bc2b      5 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbp, [rsp+38h+var_28] 
+    40bc2b      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+38h+var_28]
+    40bc30     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+38h+var_20] 
+    40bc30      5 INSTR BELONGTO 40bbc0 
+    40bc35     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+38h+var_18] 
+    40bc35      5 INSTR BELONGTO 40bbc0 
+    40bc3a     -1 INSTR LOCAL MetadataUnused mov     r14, [rsp+38h+var_10] 
+    40bc3a      5 INSTR BELONGTO 40bbc0 
+    40bc3f     -1 INSTR LOCAL MetadataUnused mov     r15, [rsp+38h+var_8] 
+    40bc3f      5 INSTR BELONGTO 40bbc0 
     40bc44     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
+    40bc44      4 INSTR BELONGTO 40bbc0 
+    40bc48      1 INSTR BELONGTO 40bbc0 
+    40bc48      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
+    40bc48     56 DEALLOC STACK esp - 56 retn
     40bc50      0 FUNC FRAMERESTORE 0 0 0 1 0 1 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     40bc50      0 FUNC MMSAFENESS SAFE
     40bc50      2 FUNC GLOBAL fini FUNC_SAFE NOFP RET FUNC_LEAF     40bc51 
@@ -11601,7 +11670,7 @@
     40bc64     -3 INSTR LOCAL NoWarn push    rbx 
     40bc65      4 INSTR BELONGTO 40bc60 
     40bc65      4 INSTR DEADREGS  EFLAGS EAX EBX ZZ sub     rsp, 8 
-    40bc65      8 DATAREF STACK 858 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bc65      8 DATAREF STACK 865 esp + 0 PARENT LocalFrame LOCALFRAME
     40bc65      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     40bc65      8 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40bc69      7 INSTR BELONGTO 40bc60 
@@ -11637,7 +11706,7 @@
     40bc98     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     40bca5 
     40bc98      4 INSTR BELONGTO 40bc98 
     40bc98      4 INSTR DEADREGS  EFLAGS EAX ECX EDX ESI EDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    40bc98      8 DATAREF STACK 859 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bc98      8 DATAREF STACK 866 esp + 0 PARENT LocalFrame LOCALFRAME
     40bc98      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40bc9c     -1 INSTR LOCAL NoMetaUpdate call    sub_406F70 
     40bc9c      5 INSTR BELONGTO 40bc98 
diff --git a/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
index dcd4c27b..3eea9e25 100644
--- a/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
@@ -3605,9 +3605,9 @@
     40903f     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     40903f      7 INSTR BELONGTO 409030 
     40903f      7 INSTR DEADREGS  EFLAGS ECX EDI R8 ZZ mov     r8, offset fini ; fini 
-    409046     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; "H‰l$ØL‰d$àH-SG " 
+    409046     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; init 
     409046      7 INSTR BELONGTO 409030 
-    409046      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; "H‰l$ØL‰d$àH-SG " 
+    409046      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; init 
     40904d     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, offset main; main 
     40904d      7 INSTR BELONGTO 409030 
     40904d      7 INSTR DEADREGS  EFLAGS EDI ZZ mov     rdi, offset main; main 
@@ -18420,26 +18420,95 @@
     412600      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     412601      1 INSTR BELONGTO 4123d0 
     412601      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    412628      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], r13
-    41262d      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r14
-    412632      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r15
-    412637      5 PTRIMMEDESP STACK -48 displ mov     [rsp-30h], rbx
-    412649     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
+    412610      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+    412610      0 FUNC MMSAFENESS SPECSAFE
+    412610    137 FUNC GLOBAL init FUNC_UNSAFE NOFP RET     412698 
+    412610      5 INSTR BELONGTO 412610 
+    412610      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_28], rbp 
+    412610      5 PTRIMMEDESP STACK -40 displ mov     [rsp+var_28], rbp
+    412615      5 INSTR BELONGTO 412610 
+    412615      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
+    412615      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
+    41261a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:616D74h 
+    41261a      7 INSTR BELONGTO 412610 
+    412621      7 INSTR BELONGTO 412610 
+    412621      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     r12, cs:616D74h 
+    412628      5 INSTR BELONGTO 412610 
+    412628      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_18], r13 
+    412628      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], r13
+    41262d      5 INSTR BELONGTO 412610 
+    41262d      5 INSTR DEADREGS  EFLAGS R13 ZZ mov     [rsp+var_10], r14 
+    41262d      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], r14
+    412632      5 INSTR BELONGTO 412610 
+    412632      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ mov     [rsp+var_8], r15 
+    412632      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
+    412637      5 INSTR BELONGTO 412610 
+    412637      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ mov     [rsp+var_30], rbx 
+    412637      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
+    41263c      4 INSTR BELONGTO 412610 
+    41263c      4 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ sub     rsp, 38h 
+    41263c     56 DATAREF STACK 1444 esp + 0 PARENT LocalFrame LOCALFRAME
+    41263c      8 DATAREF STACK 1445 esp + 8 CHILDOF 1444 OFFSET 8 LOCALVAR var_30 
+    41263c      8 DATAREF STACK 1446 esp + 16 CHILDOF 1444 OFFSET 16 LOCALVAR var_28 
+    41263c      8 DATAREF STACK 1447 esp + 24 CHILDOF 1444 OFFSET 24 LOCALVAR var_20 
+    41263c      8 DATAREF STACK 1448 esp + 32 CHILDOF 1444 OFFSET 32 LOCALVAR var_18 
+    41263c      8 DATAREF STACK 1449 esp + 40 CHILDOF 1444 OFFSET 40 LOCALVAR var_10 
+    41263c      8 DATAREF STACK 1450 esp + 48 CHILDOF 1444 OFFSET 48 LOCALVAR var_8 
+    41263c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
+    412640     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
+    412640      3 INSTR BELONGTO 412610 
+    412643      3 INSTR BELONGTO 412610 
+    412643      3 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ mov     r13d, edi 
+    412646      3 INSTR BELONGTO 412610 
+    412646      3 INSTR DEADREGS  EFLAGS EBX R14 R15 ZZ mov     r14, rsi 
+    412649     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+    412649      4 INSTR BELONGTO 412610 
+    41264d      3 INSTR BELONGTO 412610 
+    41264d      3 INSTR DEADREGS  EFLAGS EBX R15 ZZ mov     r15, rdx 
     412650     -1 INSTR LOCAL NoMetaUpdate call    _init_proc 
+    412650      5 INSTR BELONGTO 412610 
+    412650      5 INSTR DEADREGS  EFLAGS EBX ZZ call    _init_proc 
     412655     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
+    412655      3 INSTR BELONGTO 412610 
     412658     -1 INSTR LOCAL NoMetaUpdate jz      short loc_412676 
+    412658      2 INSTR BELONGTO 412610 
+    41265a      2 INSTR BELONGTO 412610 
+    41265a      2 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ xor     ebx, ebx 
     41265a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+    41265c      4 INSTR BELONGTO 412610 
+    412660      3 INSTR BELONGTO 412610 
+    412660      3 INSTR DEADREGS  EFLAGS EDX ESI EDI ZZ mov     rdx, r15 
+    412663      3 INSTR BELONGTO 412610 
+    412663      3 INSTR DEADREGS  EFLAGS ESI EDI ZZ mov     rsi, r14 
+    412666      3 INSTR BELONGTO 412610 
+    412666      3 INSTR DEADREGS  EFLAGS EDI ZZ mov     edi, r13d 
     412669     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [r12+rbx*8] 
+    412669      4 INSTR BELONGTO 412610 
     41266d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbx, 1 
+    41266d      4 INSTR BELONGTO 412610 
     412671     -1 INSTR LOCAL NoMetaUpdate cmp     rbx, rbp 
+    412671      3 INSTR BELONGTO 412610 
     412674     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_412660 
-    412676      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
-    41267b      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
-    412680      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
-    412685      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
-    41268a      5 PTRIMMEDESP STACK 40 displ mov     r14, [rsp+28h]
-    41268f      5 PTRIMMEDESP STACK 48 displ mov     r15, [rsp+30h]
+    412674      2 INSTR BELONGTO 412610 
+    412676      5 INSTR BELONGTO 412610 
+    412676      5 INSTR DEADREGS  EFLAGS EBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbx, [rsp+38h+var_30] 
+    412676      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+38h+var_30]
+    41267b      5 INSTR BELONGTO 412610 
+    41267b      5 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbp, [rsp+38h+var_28] 
+    41267b      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+38h+var_28]
+    412680     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+38h+var_20] 
+    412680      5 INSTR BELONGTO 412610 
+    412685     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+38h+var_18] 
+    412685      5 INSTR BELONGTO 412610 
+    41268a     -1 INSTR LOCAL MetadataUnused mov     r14, [rsp+38h+var_10] 
+    41268a      5 INSTR BELONGTO 412610 
+    41268f     -1 INSTR LOCAL MetadataUnused mov     r15, [rsp+38h+var_8] 
+    41268f      5 INSTR BELONGTO 412610 
     412694     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
+    412694      4 INSTR BELONGTO 412610 
+    412698      1 INSTR BELONGTO 412610 
+    412698      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
+    412698     56 DEALLOC STACK esp - 56 retn
     4126a0      0 FUNC FRAMERESTORE 0 0 0 1 0 1 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     4126a0      0 FUNC MMSAFENESS SAFE
     4126a0      2 FUNC GLOBAL fini FUNC_SAFE NOFP RET FUNC_LEAF     4126a1 
@@ -18460,7 +18529,7 @@
     4126b4     -3 INSTR LOCAL NoWarn push    rbx 
     4126b5      4 INSTR BELONGTO 4126b0 
     4126b5      4 INSTR DEADREGS  EFLAGS EAX EBX ZZ sub     rsp, 8 
-    4126b5      8 DATAREF STACK 1444 esp + 0 PARENT LocalFrame LOCALFRAME
+    4126b5      8 DATAREF STACK 1451 esp + 0 PARENT LocalFrame LOCALFRAME
     4126b5      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     4126b5      8 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4126b9      7 INSTR BELONGTO 4126b0 
@@ -18496,7 +18565,7 @@
     4126e8     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     4126f5 
     4126e8      4 INSTR BELONGTO 4126e8 
     4126e8      4 INSTR DEADREGS  EFLAGS EAX ECX EDX ESI EDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    4126e8      8 DATAREF STACK 1445 esp + 0 PARENT LocalFrame LOCALFRAME
+    4126e8      8 DATAREF STACK 1452 esp + 0 PARENT LocalFrame LOCALFRAME
     4126e8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4126ec     -1 INSTR LOCAL NoMetaUpdate call    sub_409080 
     4126ec      5 INSTR BELONGTO 4126e8 
diff --git a/tests/commit/trimmed-sorted-save-gnome-font-viewer.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-font-viewer.psexe.annot
index 42813b5b..1d5b8820 100644
--- a/tests/commit/trimmed-sorted-save-gnome-font-viewer.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-font-viewer.psexe.annot
@@ -2420,9 +2420,9 @@
     4036bb     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     4036bb      7 INSTR BELONGTO 4036ac 
     4036bb      7 INSTR DEADREGS  EFLAGS ECX EDI R8 ZZ mov     r8, offset fini ; fini 
-    4036c2     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; "H‰l$ØL‰d$àH-³\b " 
+    4036c2     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; init 
     4036c2      7 INSTR BELONGTO 4036ac 
-    4036c2      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; "H‰l$ØL‰d$àH-³\b " 
+    4036c2      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; init 
     4036c9     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, offset main; main 
     4036c9      7 INSTR BELONGTO 4036ac 
     4036c9      7 INSTR DEADREGS  EFLAGS EDI ZZ mov     rdi, offset main; main 
@@ -3880,26 +3880,95 @@
     4044b4     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4043E4 
     4044c0     -2 INSTR LOCAL n R12 ZZ  AlwaysNUM cvttsd2si r12d, xmm0 
     4044c5     -1 INSTR LOCAL NoMetaUpdate jmp     loc_404396 
-    4044e8      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], r13
-    4044ed      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r14
-    4044f2      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r15
-    4044f7      5 PTRIMMEDESP STACK -48 displ mov     [rsp-30h], rbx
-    404509     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
+    4044d0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+    4044d0      0 FUNC MMSAFENESS SPECSAFE
+    4044d0    137 FUNC GLOBAL init FUNC_UNSAFE NOFP RET     404558 
+    4044d0      5 INSTR BELONGTO 4044d0 
+    4044d0      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_28], rbp 
+    4044d0      5 PTRIMMEDESP STACK -40 displ mov     [rsp+var_28], rbp
+    4044d5      5 INSTR BELONGTO 4044d0 
+    4044d5      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
+    4044d5      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
+    4044da     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:604D94h 
+    4044da      7 INSTR BELONGTO 4044d0 
+    4044e1      7 INSTR BELONGTO 4044d0 
+    4044e1      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     r12, cs:604D94h 
+    4044e8      5 INSTR BELONGTO 4044d0 
+    4044e8      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_18], r13 
+    4044e8      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], r13
+    4044ed      5 INSTR BELONGTO 4044d0 
+    4044ed      5 INSTR DEADREGS  EFLAGS R13 ZZ mov     [rsp+var_10], r14 
+    4044ed      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], r14
+    4044f2      5 INSTR BELONGTO 4044d0 
+    4044f2      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ mov     [rsp+var_8], r15 
+    4044f2      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
+    4044f7      5 INSTR BELONGTO 4044d0 
+    4044f7      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ mov     [rsp+var_30], rbx 
+    4044f7      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
+    4044fc      4 INSTR BELONGTO 4044d0 
+    4044fc      4 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ sub     rsp, 38h 
+    4044fc     56 DATAREF STACK 241 esp + 0 PARENT LocalFrame LOCALFRAME
+    4044fc      8 DATAREF STACK 242 esp + 8 CHILDOF 241 OFFSET 8 LOCALVAR var_30 
+    4044fc      8 DATAREF STACK 243 esp + 16 CHILDOF 241 OFFSET 16 LOCALVAR var_28 
+    4044fc      8 DATAREF STACK 244 esp + 24 CHILDOF 241 OFFSET 24 LOCALVAR var_20 
+    4044fc      8 DATAREF STACK 245 esp + 32 CHILDOF 241 OFFSET 32 LOCALVAR var_18 
+    4044fc      8 DATAREF STACK 246 esp + 40 CHILDOF 241 OFFSET 40 LOCALVAR var_10 
+    4044fc      8 DATAREF STACK 247 esp + 48 CHILDOF 241 OFFSET 48 LOCALVAR var_8 
+    4044fc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
+    404500     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
+    404500      3 INSTR BELONGTO 4044d0 
+    404503      3 INSTR BELONGTO 4044d0 
+    404503      3 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ mov     r13d, edi 
+    404506      3 INSTR BELONGTO 4044d0 
+    404506      3 INSTR DEADREGS  EFLAGS EBX R14 R15 ZZ mov     r14, rsi 
+    404509     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+    404509      4 INSTR BELONGTO 4044d0 
+    40450d      3 INSTR BELONGTO 4044d0 
+    40450d      3 INSTR DEADREGS  EFLAGS EBX R15 ZZ mov     r15, rdx 
     404510     -1 INSTR LOCAL NoMetaUpdate call    _init_proc 
+    404510      5 INSTR BELONGTO 4044d0 
+    404510      5 INSTR DEADREGS  EFLAGS EBX ZZ call    _init_proc 
     404515     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
+    404515      3 INSTR BELONGTO 4044d0 
     404518     -1 INSTR LOCAL NoMetaUpdate jz      short loc_404536 
+    404518      2 INSTR BELONGTO 4044d0 
+    40451a      2 INSTR BELONGTO 4044d0 
+    40451a      2 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ xor     ebx, ebx 
     40451a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+    40451c      4 INSTR BELONGTO 4044d0 
+    404520      3 INSTR BELONGTO 4044d0 
+    404520      3 INSTR DEADREGS  EFLAGS EDX ESI EDI ZZ mov     rdx, r15 
+    404523      3 INSTR BELONGTO 4044d0 
+    404523      3 INSTR DEADREGS  EFLAGS ESI EDI ZZ mov     rsi, r14 
+    404526      3 INSTR BELONGTO 4044d0 
+    404526      3 INSTR DEADREGS  EFLAGS EDI ZZ mov     edi, r13d 
     404529     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [r12+rbx*8] 
+    404529      4 INSTR BELONGTO 4044d0 
     40452d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbx, 1 
+    40452d      4 INSTR BELONGTO 4044d0 
     404531     -1 INSTR LOCAL NoMetaUpdate cmp     rbx, rbp 
+    404531      3 INSTR BELONGTO 4044d0 
     404534     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_404520 
-    404536      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
-    40453b      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
-    404540      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
-    404545      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
-    40454a      5 PTRIMMEDESP STACK 40 displ mov     r14, [rsp+28h]
-    40454f      5 PTRIMMEDESP STACK 48 displ mov     r15, [rsp+30h]
+    404534      2 INSTR BELONGTO 4044d0 
+    404536      5 INSTR BELONGTO 4044d0 
+    404536      5 INSTR DEADREGS  EFLAGS EBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbx, [rsp+38h+var_30] 
+    404536      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+38h+var_30]
+    40453b      5 INSTR BELONGTO 4044d0 
+    40453b      5 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbp, [rsp+38h+var_28] 
+    40453b      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+38h+var_28]
+    404540     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+38h+var_20] 
+    404540      5 INSTR BELONGTO 4044d0 
+    404545     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+38h+var_18] 
+    404545      5 INSTR BELONGTO 4044d0 
+    40454a     -1 INSTR LOCAL MetadataUnused mov     r14, [rsp+38h+var_10] 
+    40454a      5 INSTR BELONGTO 4044d0 
+    40454f     -1 INSTR LOCAL MetadataUnused mov     r15, [rsp+38h+var_8] 
+    40454f      5 INSTR BELONGTO 4044d0 
     404554     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
+    404554      4 INSTR BELONGTO 4044d0 
+    404558      1 INSTR BELONGTO 4044d0 
+    404558      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
+    404558     56 DEALLOC STACK esp - 56 retn
     404560      0 FUNC FRAMERESTORE 0 0 0 1 0 1 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     404560      0 FUNC MMSAFENESS SAFE
     404560      2 FUNC GLOBAL fini FUNC_SAFE NOFP RET FUNC_LEAF     404561 
@@ -3920,7 +3989,7 @@
     404574     -3 INSTR LOCAL NoWarn push    rbx 
     404575      4 INSTR BELONGTO 404570 
     404575      4 INSTR DEADREGS  EFLAGS EAX EBX ZZ sub     rsp, 8 
-    404575      8 DATAREF STACK 241 esp + 0 PARENT LocalFrame LOCALFRAME
+    404575      8 DATAREF STACK 248 esp + 0 PARENT LocalFrame LOCALFRAME
     404575      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     404575      8 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     404579      7 INSTR BELONGTO 404570 
@@ -3956,7 +4025,7 @@
     4045a8     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     4045b5 
     4045a8      4 INSTR BELONGTO 4045a8 
     4045a8      4 INSTR DEADREGS  EFLAGS EAX ECX EDX ESI EDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    4045a8      8 DATAREF STACK 242 esp + 0 PARENT LocalFrame LOCALFRAME
+    4045a8      8 DATAREF STACK 249 esp + 0 PARENT LocalFrame LOCALFRAME
     4045a8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4045ac     -1 INSTR LOCAL NoMetaUpdate call    sub_4036F0 
     4045ac      5 INSTR BELONGTO 4045a8 
diff --git a/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot
index 40d2e6e4..8608ed03 100644
--- a/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot
@@ -1881,9 +1881,9 @@
     40500f     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     40500f      7 INSTR BELONGTO 405000 
     40500f      7 INSTR DEADREGS  EFLAGS ECX EDI R8 ZZ mov     r8, offset fini ; fini 
-    405016     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; "H‰l$ØL‰d$àH-3* " 
+    405016     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; init 
     405016      7 INSTR BELONGTO 405000 
-    405016      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; "H‰l$ØL‰d$àH-3* " 
+    405016      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; init 
     40501d     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, offset main; main 
     40501d      7 INSTR BELONGTO 405000 
     40501d      7 INSTR DEADREGS  EFLAGS EDI ZZ mov     rdi, offset main; main 
@@ -8728,26 +8728,95 @@
     40934f      1 INSTR BELONGTO 409300 
     40934f      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ retn 
     40934f     24 DEALLOC STACK esp - 24 retn
-    409368      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], r13
-    40936d      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r14
-    409372      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r15
-    409377      5 PTRIMMEDESP STACK -48 displ mov     [rsp-30h], rbx
-    409389     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
+    409350      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+    409350      0 FUNC MMSAFENESS SPECSAFE
+    409350    137 FUNC GLOBAL init FUNC_UNSAFE NOFP RET     4093d8 
+    409350      5 INSTR BELONGTO 409350 
+    409350      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_28], rbp 
+    409350      5 PTRIMMEDESP STACK -40 displ mov     [rsp+var_28], rbp
+    409355      5 INSTR BELONGTO 409350 
+    409355      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
+    409355      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
+    40935a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:60BD94h 
+    40935a      7 INSTR BELONGTO 409350 
+    409361      7 INSTR BELONGTO 409350 
+    409361      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     r12, cs:60BD94h 
+    409368      5 INSTR BELONGTO 409350 
+    409368      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_18], r13 
+    409368      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], r13
+    40936d      5 INSTR BELONGTO 409350 
+    40936d      5 INSTR DEADREGS  EFLAGS R13 ZZ mov     [rsp+var_10], r14 
+    40936d      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], r14
+    409372      5 INSTR BELONGTO 409350 
+    409372      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ mov     [rsp+var_8], r15 
+    409372      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
+    409377      5 INSTR BELONGTO 409350 
+    409377      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ mov     [rsp+var_30], rbx 
+    409377      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
+    40937c      4 INSTR BELONGTO 409350 
+    40937c      4 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ sub     rsp, 38h 
+    40937c     56 DATAREF STACK 651 esp + 0 PARENT LocalFrame LOCALFRAME
+    40937c      8 DATAREF STACK 652 esp + 8 CHILDOF 651 OFFSET 8 LOCALVAR var_30 
+    40937c      8 DATAREF STACK 653 esp + 16 CHILDOF 651 OFFSET 16 LOCALVAR var_28 
+    40937c      8 DATAREF STACK 654 esp + 24 CHILDOF 651 OFFSET 24 LOCALVAR var_20 
+    40937c      8 DATAREF STACK 655 esp + 32 CHILDOF 651 OFFSET 32 LOCALVAR var_18 
+    40937c      8 DATAREF STACK 656 esp + 40 CHILDOF 651 OFFSET 40 LOCALVAR var_10 
+    40937c      8 DATAREF STACK 657 esp + 48 CHILDOF 651 OFFSET 48 LOCALVAR var_8 
+    40937c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
+    409380     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
+    409380      3 INSTR BELONGTO 409350 
+    409383      3 INSTR BELONGTO 409350 
+    409383      3 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ mov     r13d, edi 
+    409386      3 INSTR BELONGTO 409350 
+    409386      3 INSTR DEADREGS  EFLAGS EBX R14 R15 ZZ mov     r14, rsi 
+    409389     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+    409389      4 INSTR BELONGTO 409350 
+    40938d      3 INSTR BELONGTO 409350 
+    40938d      3 INSTR DEADREGS  EFLAGS EBX R15 ZZ mov     r15, rdx 
     409390     -1 INSTR LOCAL NoMetaUpdate call    _init_proc 
+    409390      5 INSTR BELONGTO 409350 
+    409390      5 INSTR DEADREGS  EFLAGS EBX ZZ call    _init_proc 
     409395     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
+    409395      3 INSTR BELONGTO 409350 
     409398     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4093B6 
+    409398      2 INSTR BELONGTO 409350 
+    40939a      2 INSTR BELONGTO 409350 
+    40939a      2 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ xor     ebx, ebx 
     40939a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+    40939c      4 INSTR BELONGTO 409350 
+    4093a0      3 INSTR BELONGTO 409350 
+    4093a0      3 INSTR DEADREGS  EFLAGS EDX ESI EDI ZZ mov     rdx, r15 
+    4093a3      3 INSTR BELONGTO 409350 
+    4093a3      3 INSTR DEADREGS  EFLAGS ESI EDI ZZ mov     rsi, r14 
+    4093a6      3 INSTR BELONGTO 409350 
+    4093a6      3 INSTR DEADREGS  EFLAGS EDI ZZ mov     edi, r13d 
     4093a9     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [r12+rbx*8] 
+    4093a9      4 INSTR BELONGTO 409350 
     4093ad     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbx, 1 
+    4093ad      4 INSTR BELONGTO 409350 
     4093b1     -1 INSTR LOCAL NoMetaUpdate cmp     rbx, rbp 
+    4093b1      3 INSTR BELONGTO 409350 
     4093b4     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4093A0 
-    4093b6      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
-    4093bb      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
-    4093c0      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
-    4093c5      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
-    4093ca      5 PTRIMMEDESP STACK 40 displ mov     r14, [rsp+28h]
-    4093cf      5 PTRIMMEDESP STACK 48 displ mov     r15, [rsp+30h]
+    4093b4      2 INSTR BELONGTO 409350 
+    4093b6      5 INSTR BELONGTO 409350 
+    4093b6      5 INSTR DEADREGS  EFLAGS EBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbx, [rsp+38h+var_30] 
+    4093b6      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+38h+var_30]
+    4093bb      5 INSTR BELONGTO 409350 
+    4093bb      5 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbp, [rsp+38h+var_28] 
+    4093bb      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+38h+var_28]
+    4093c0     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+38h+var_20] 
+    4093c0      5 INSTR BELONGTO 409350 
+    4093c5     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+38h+var_18] 
+    4093c5      5 INSTR BELONGTO 409350 
+    4093ca     -1 INSTR LOCAL MetadataUnused mov     r14, [rsp+38h+var_10] 
+    4093ca      5 INSTR BELONGTO 409350 
+    4093cf     -1 INSTR LOCAL MetadataUnused mov     r15, [rsp+38h+var_8] 
+    4093cf      5 INSTR BELONGTO 409350 
     4093d4     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
+    4093d4      4 INSTR BELONGTO 409350 
+    4093d8      1 INSTR BELONGTO 409350 
+    4093d8      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
+    4093d8     56 DEALLOC STACK esp - 56 retn
     4093e0      0 FUNC FRAMERESTORE 0 0 0 1 0 1 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     4093e0      0 FUNC MMSAFENESS SAFE
     4093e0      2 FUNC GLOBAL fini FUNC_SAFE NOFP RET FUNC_LEAF     4093e1 
@@ -8768,7 +8837,7 @@
     4093f4     -3 INSTR LOCAL NoWarn push    rbx 
     4093f5      4 INSTR BELONGTO 4093f0 
     4093f5      4 INSTR DEADREGS  EFLAGS EAX EBX ZZ sub     rsp, 8 
-    4093f5      8 DATAREF STACK 651 esp + 0 PARENT LocalFrame LOCALFRAME
+    4093f5      8 DATAREF STACK 658 esp + 0 PARENT LocalFrame LOCALFRAME
     4093f5      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     4093f5      8 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4093f9      7 INSTR BELONGTO 4093f0 
@@ -8804,7 +8873,7 @@
     409428     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     409435 
     409428      4 INSTR BELONGTO 409428 
     409428      4 INSTR DEADREGS  EFLAGS EAX ECX EDX ESI EDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    409428      8 DATAREF STACK 652 esp + 0 PARENT LocalFrame LOCALFRAME
+    409428      8 DATAREF STACK 659 esp + 0 PARENT LocalFrame LOCALFRAME
     409428      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40942c     -1 INSTR LOCAL NoMetaUpdate call    sub_405050 
     40942c      5 INSTR BELONGTO 409428 
diff --git a/tests/commit/trimmed-sorted-save-gnome-keyring-daemon.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gnome-keyring-daemon.psexe.annot.REMOVED.git-id
index d7cbb44e..cba0ac15 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring-daemon.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring-daemon.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-77a26b8add0b5f755f106306f1a5a53097b24d3e
\ No newline at end of file
+2c66670b71eed8654d114c7bfab9805fe31c11e8
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-power-statistics.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-power-statistics.psexe.annot
index 0c6a5e48..192e70f2 100644
--- a/tests/commit/trimmed-sorted-save-gnome-power-statistics.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-power-statistics.psexe.annot
@@ -206,7 +206,7 @@
          0     24 DATAREF GLOBAL      437 40dff0 PARENT SMP_dummy45  VOID RO
          0     24 DATAREF GLOBAL      441 40e6f0 PARENT SMP_dummy49  VOID RO
          0     24 DATAREF GLOBAL      442 40e708 PARENT SMP_dummy50  VOID RO
-         0     24 DATAREF GLOBAL      455 60efe8 PARENT SMP_dummy57  VOID RW
+         0     24 DATAREF GLOBAL      455 60efe8 PARENT SMP_dummy56  VOID RW
          0     25 DATAREF GLOBAL      107 40c20f PARENT aSchedule_hrtim  VOID RO
          0     25 DATAREF GLOBAL      221 40c6cf PARENT aCheckbutton_sm  VOID RO
          0     25 DATAREF GLOBAL      222 40c6e8 PARENT aCheckbutton_po  VOID RO
@@ -240,8 +240,8 @@
          0     32 DATAREF GLOBAL       15 40be40 PARENT aGpm_array_fl_1  VOID RO
          0     32 DATAREF GLOBAL      352 40cfa0 PARENT aGpm_stats_type  VOID RO
          0     32 DATAREF GLOBAL      402 40d2c0 PARENT aGpm_graph_wi_4  VOID RO
-         0     32 DATAREF GLOBAL      657 60f660 PARENT SMP_dummy58  VOID RW
-         0     32 DATAREF GLOBAL      659 60f688 PARENT SMP_dummy59  VOID RW
+         0     32 DATAREF GLOBAL      657 60f660 PARENT SMP_dummy57  VOID RW
+         0     32 DATAREF GLOBAL      659 60f688 PARENT SMP_dummy58  VOID RW
          0     33 DATAREF GLOBAL       11 40bdc0 PARENT aGpm_array_floa  VOID RO
          0     33 DATAREF GLOBAL       13 40be00 PARENT aGpm_array_fl_0  VOID RO
          0     33 DATAREF GLOBAL      325 40cc58 PARENT aShowExtraDebug  VOID RO
@@ -300,9 +300,9 @@
          0      4 DATAREF GLOBAL       47 40bf41 PARENT a100  VOID RO
          0      4 DATAREF GLOBAL       61 40bfec PARENT dword_40BFEC  VOID RO
          0      4 DATAREF GLOBAL      672 60f700 PARENT dword_60F700  VOID RW
-         0      4 DATAREF GLOBAL      673 60f704 PARENT SMP_dummy61  VOID RW
+         0      4 DATAREF GLOBAL      673 60f704 PARENT SMP_dummy60  VOID RW
          0      4 DATAREF GLOBAL      676 60f718 PARENT dword_60F718  VOID RW
-         0      4 DATAREF GLOBAL      677 60f71c PARENT SMP_dummy62  VOID RW
+         0      4 DATAREF GLOBAL      677 60f71c PARENT SMP_dummy61  VOID RW
          0     51 DATAREF GLOBAL      397 40d1b0 PARENT aSInvalidSIdUFo  VOID RO
          0     53 DATAREF GLOBAL        9 40bd70 PARENT aGotWrongSumFPe  VOID RO
          0    560 DATAREF GLOBAL      433 40dcf0 PARENT SMP_dummy41  VOID RO
@@ -377,7 +377,7 @@
          0      7 DATAREF GLOBAL       33 40bed9 PARENT aDevice  VOID RO
          0      7 DATAREF GLOBAL      393 40d187 PARENT aSans8  VOID RO
          0      7 DATAREF GLOBAL      430 40d3f9 PARENT SMP_dummy38  VOID RO
-         0      7 DATAREF GLOBAL      661 60f6a9 PARENT SMP_dummy60  VOID RW
+         0      7 DATAREF GLOBAL      661 60f6a9 PARENT SMP_dummy59  VOID RW
          0      7 DATAREF GLOBAL       68 40c018 PARENT aInsmod  VOID RO
          0      7 DATAREF GLOBAL        8 40bd69 PARENT SMP_dummy1  VOID RO
          0      7 DATAREF GLOBAL       84 40c0c3 PARENT aLibata  VOID RO
@@ -425,9 +425,9 @@
          0      8 DATAREF GLOBAL      419 40d3c0 PARENT qword_40D3C0  VOID RO
          0      8 DATAREF GLOBAL      432 40dce8 PARENT SMP_dummy40  VOID RO
          0      8 DATAREF GLOBAL      447 60ed48 PARENT off_60ED48  OFFSET RW
-         0      8 DATAREF GLOBAL      448 60ed50 PARENT SMP_dummy55  OFFSET RW
+         0      8 DATAREF GLOBAL      448 60ed50 PARENT off_60ED50  OFFSET RW
          0      8 DATAREF GLOBAL      449 60ed58 PARENT qword_60ED58  VOID RW
-         0      8 DATAREF GLOBAL      450 60ed60 PARENT SMP_dummy56  VOID RW
+         0      8 DATAREF GLOBAL      450 60ed60 PARENT SMP_dummy55  VOID RW
          0      8 DATAREF GLOBAL      451 60ed68 PARENT qword_60ED68  VOID RW
          0      8 DATAREF GLOBAL      452 60ed70 PARENT qword_60ED70  VOID RW
          0      8 DATAREF GLOBAL      453 60ed78 PARENT qword_60ED78  VOID RW
@@ -2095,9 +2095,9 @@
     404afb     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     404afb      7 INSTR BELONGTO 404aec 
     404afb      7 INSTR DEADREGS  EFLAGS ECX EDI R8 ZZ mov     r8, offset fini ; fini 
-    404b02     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; "H‰l$ØL‰d$àH-/1 " 
+    404b02     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; init 
     404b02      7 INSTR BELONGTO 404aec 
-    404b02      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; "H‰l$ØL‰d$àH-/1 " 
+    404b02      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; init 
     404b09     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, offset main; main 
     404b09      7 INSTR BELONGTO 404aec 
     404b09      7 INSTR DEADREGS  EFLAGS EDI ZZ mov     rdi, offset main; main 
@@ -12727,26 +12727,95 @@
     40bc04     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
     40bc04      5 INSTR BELONGTO 40bbf0 
     40bc04      5 INSTR DEADREGS  EFLAGS ESI EDI R8 R9 R10 R11 ZZ jmp     _g_object_new 
-    40bc28      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], r13
-    40bc2d      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r14
-    40bc32      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r15
-    40bc37      5 PTRIMMEDESP STACK -48 displ mov     [rsp-30h], rbx
-    40bc49     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
+    40bc10      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+    40bc10      0 FUNC MMSAFENESS SPECSAFE
+    40bc10    137 FUNC GLOBAL init FUNC_UNSAFE NOFP RET     40bc98 
+    40bc10      5 INSTR BELONGTO 40bc10 
+    40bc10      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_28], rbp 
+    40bc10      5 PTRIMMEDESP STACK -40 displ mov     [rsp+var_28], rbp
+    40bc15      5 INSTR BELONGTO 40bc10 
+    40bc15      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
+    40bc15      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
+    40bc1a     -1 INSTR LOCAL MetadataUnused lea     rbp, off_60ED50 
+    40bc1a      7 INSTR BELONGTO 40bc10 
+    40bc21      7 INSTR BELONGTO 40bc10 
+    40bc21      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     r12, off_60ED48 
+    40bc28      5 INSTR BELONGTO 40bc10 
+    40bc28      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_18], r13 
+    40bc28      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], r13
+    40bc2d      5 INSTR BELONGTO 40bc10 
+    40bc2d      5 INSTR DEADREGS  EFLAGS R13 ZZ mov     [rsp+var_10], r14 
+    40bc2d      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], r14
+    40bc32      5 INSTR BELONGTO 40bc10 
+    40bc32      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ mov     [rsp+var_8], r15 
+    40bc32      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
+    40bc37      5 INSTR BELONGTO 40bc10 
+    40bc37      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ mov     [rsp+var_30], rbx 
+    40bc37      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
+    40bc3c      4 INSTR BELONGTO 40bc10 
+    40bc3c      4 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ sub     rsp, 38h 
+    40bc3c     56 DATAREF STACK 829 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bc3c      8 DATAREF STACK 830 esp + 8 CHILDOF 829 OFFSET 8 LOCALVAR var_30 
+    40bc3c      8 DATAREF STACK 831 esp + 16 CHILDOF 829 OFFSET 16 LOCALVAR var_28 
+    40bc3c      8 DATAREF STACK 832 esp + 24 CHILDOF 829 OFFSET 24 LOCALVAR var_20 
+    40bc3c      8 DATAREF STACK 833 esp + 32 CHILDOF 829 OFFSET 32 LOCALVAR var_18 
+    40bc3c      8 DATAREF STACK 834 esp + 40 CHILDOF 829 OFFSET 40 LOCALVAR var_10 
+    40bc3c      8 DATAREF STACK 835 esp + 48 CHILDOF 829 OFFSET 48 LOCALVAR var_8 
+    40bc3c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
+    40bc40     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
+    40bc40      3 INSTR BELONGTO 40bc10 
+    40bc43      3 INSTR BELONGTO 40bc10 
+    40bc43      3 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ mov     r13d, edi 
+    40bc46      3 INSTR BELONGTO 40bc10 
+    40bc46      3 INSTR DEADREGS  EFLAGS EBX R14 R15 ZZ mov     r14, rsi 
+    40bc49     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+    40bc49      4 INSTR BELONGTO 40bc10 
+    40bc4d      3 INSTR BELONGTO 40bc10 
+    40bc4d      3 INSTR DEADREGS  EFLAGS EBX R15 ZZ mov     r15, rdx 
     40bc50     -1 INSTR LOCAL NoMetaUpdate call    _init_proc 
+    40bc50      5 INSTR BELONGTO 40bc10 
+    40bc50      5 INSTR DEADREGS  EFLAGS EBX ZZ call    _init_proc 
     40bc55     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
+    40bc55      3 INSTR BELONGTO 40bc10 
     40bc58     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40BC76 
+    40bc58      2 INSTR BELONGTO 40bc10 
+    40bc5a      2 INSTR BELONGTO 40bc10 
+    40bc5a      2 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ xor     ebx, ebx 
     40bc5a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+    40bc5c      4 INSTR BELONGTO 40bc10 
+    40bc60      3 INSTR BELONGTO 40bc10 
+    40bc60      3 INSTR DEADREGS  EFLAGS EDX ESI EDI ZZ mov     rdx, r15 
+    40bc63      3 INSTR BELONGTO 40bc10 
+    40bc63      3 INSTR DEADREGS  EFLAGS ESI EDI ZZ mov     rsi, r14 
+    40bc66      3 INSTR BELONGTO 40bc10 
+    40bc66      3 INSTR DEADREGS  EFLAGS EDI ZZ mov     edi, r13d 
     40bc69     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [r12+rbx*8] 
+    40bc69      4 INSTR BELONGTO 40bc10 
     40bc6d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbx, 1 
+    40bc6d      4 INSTR BELONGTO 40bc10 
     40bc71     -1 INSTR LOCAL NoMetaUpdate cmp     rbx, rbp 
+    40bc71      3 INSTR BELONGTO 40bc10 
     40bc74     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40BC60 
-    40bc76      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
-    40bc7b      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
-    40bc80      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
-    40bc85      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
-    40bc8a      5 PTRIMMEDESP STACK 40 displ mov     r14, [rsp+28h]
-    40bc8f      5 PTRIMMEDESP STACK 48 displ mov     r15, [rsp+30h]
+    40bc74      2 INSTR BELONGTO 40bc10 
+    40bc76      5 INSTR BELONGTO 40bc10 
+    40bc76      5 INSTR DEADREGS  EFLAGS EBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbx, [rsp+38h+var_30] 
+    40bc76      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+38h+var_30]
+    40bc7b      5 INSTR BELONGTO 40bc10 
+    40bc7b      5 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbp, [rsp+38h+var_28] 
+    40bc7b      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+38h+var_28]
+    40bc80     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+38h+var_20] 
+    40bc80      5 INSTR BELONGTO 40bc10 
+    40bc85     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+38h+var_18] 
+    40bc85      5 INSTR BELONGTO 40bc10 
+    40bc8a     -1 INSTR LOCAL MetadataUnused mov     r14, [rsp+38h+var_10] 
+    40bc8a      5 INSTR BELONGTO 40bc10 
+    40bc8f     -1 INSTR LOCAL MetadataUnused mov     r15, [rsp+38h+var_8] 
+    40bc8f      5 INSTR BELONGTO 40bc10 
     40bc94     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
+    40bc94      4 INSTR BELONGTO 40bc10 
+    40bc98      1 INSTR BELONGTO 40bc10 
+    40bc98      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
+    40bc98     56 DEALLOC STACK esp - 56 retn
     40bca0      0 FUNC FRAMERESTORE 0 0 0 1 0 1 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     40bca0      0 FUNC MMSAFENESS SAFE
     40bca0      2 FUNC GLOBAL fini FUNC_SAFE NOFP RET FUNC_LEAF     40bca1 
@@ -12767,7 +12836,7 @@
     40bcb4     -3 INSTR LOCAL NoWarn push    rbx 
     40bcb5      4 INSTR BELONGTO 40bcb0 
     40bcb5      4 INSTR DEADREGS  EFLAGS EAX EBX ZZ sub     rsp, 8 
-    40bcb5      8 DATAREF STACK 829 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bcb5      8 DATAREF STACK 836 esp + 0 PARENT LocalFrame LOCALFRAME
     40bcb5      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     40bcb5      8 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40bcb9      7 INSTR BELONGTO 40bcb0 
@@ -12803,7 +12872,7 @@
     40bce8     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     40bcf5 
     40bce8      4 INSTR BELONGTO 40bce8 
     40bce8      4 INSTR DEADREGS  EFLAGS EAX ECX EDX ESI EDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    40bce8      8 DATAREF STACK 830 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bce8      8 DATAREF STACK 837 esp + 0 PARENT LocalFrame LOCALFRAME
     40bce8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40bcec     -1 INSTR LOCAL NoMetaUpdate call    sub_404B30 
     40bcec      5 INSTR BELONGTO 40bce8 
diff --git a/tests/commit/trimmed-sorted-save-gnome-search-tool.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gnome-search-tool.psexe.annot.REMOVED.git-id
index d9293d1b..b2e5db05 100644
--- a/tests/commit/trimmed-sorted-save-gnome-search-tool.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gnome-search-tool.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-3b2fdad0a6b934a83805972e869a2acca9efaeea
\ No newline at end of file
+bc2e0d3983cca82a0e8ab0f68c229f0b4de6a22d
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-sound-recorder.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-sound-recorder.psexe.annot
index b656d193..d5c9f96e 100644
--- a/tests/commit/trimmed-sorted-save-gnome-sound-recorder.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-sound-recorder.psexe.annot
@@ -2783,9 +2783,9 @@
     40685f     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     40685f      7 INSTR BELONGTO 406850 
     40685f      7 INSTR DEADREGS  EFLAGS ECX EDI R8 ZZ mov     r8, offset fini ; fini 
-    406866     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; "H‰l$ØL‰d$àH-£- " 
+    406866     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; init 
     406866      7 INSTR BELONGTO 406850 
-    406866      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; "H‰l$ØL‰d$àH-£- " 
+    406866      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; init 
     40686d     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, offset main; main 
     40686d      7 INSTR BELONGTO 406850 
     40686d      7 INSTR DEADREGS  EFLAGS EDI ZZ mov     rdi, offset main; main 
@@ -15486,26 +15486,95 @@
     40cf85      7 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     [rbx+0D0h], rax 
     40cf8c     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40CF14 
     40cf8c      2 INSTR BELONGTO 40ce30 
-    40cfa8      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], r13
-    40cfad      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r14
-    40cfb2      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r15
-    40cfb7      5 PTRIMMEDESP STACK -48 displ mov     [rsp-30h], rbx
-    40cfc9     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
+    40cf90      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+    40cf90      0 FUNC MMSAFENESS SPECSAFE
+    40cf90    137 FUNC GLOBAL init FUNC_UNSAFE NOFP RET     40d018 
+    40cf90      5 INSTR BELONGTO 40cf90 
+    40cf90      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_28], rbp 
+    40cf90      5 PTRIMMEDESP STACK -40 displ mov     [rsp+var_28], rbp
+    40cf95      5 INSTR BELONGTO 40cf90 
+    40cf95      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
+    40cf95      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
+    40cf9a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:60FD44h 
+    40cf9a      7 INSTR BELONGTO 40cf90 
+    40cfa1      7 INSTR BELONGTO 40cf90 
+    40cfa1      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     r12, cs:60FD44h 
+    40cfa8      5 INSTR BELONGTO 40cf90 
+    40cfa8      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_18], r13 
+    40cfa8      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], r13
+    40cfad      5 INSTR BELONGTO 40cf90 
+    40cfad      5 INSTR DEADREGS  EFLAGS R13 ZZ mov     [rsp+var_10], r14 
+    40cfad      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], r14
+    40cfb2      5 INSTR BELONGTO 40cf90 
+    40cfb2      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ mov     [rsp+var_8], r15 
+    40cfb2      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
+    40cfb7      5 INSTR BELONGTO 40cf90 
+    40cfb7      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ mov     [rsp+var_30], rbx 
+    40cfb7      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
+    40cfbc      4 INSTR BELONGTO 40cf90 
+    40cfbc      4 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ sub     rsp, 38h 
+    40cfbc     56 DATAREF STACK 986 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cfbc      8 DATAREF STACK 987 esp + 8 CHILDOF 986 OFFSET 8 LOCALVAR var_30 
+    40cfbc      8 DATAREF STACK 988 esp + 16 CHILDOF 986 OFFSET 16 LOCALVAR var_28 
+    40cfbc      8 DATAREF STACK 989 esp + 24 CHILDOF 986 OFFSET 24 LOCALVAR var_20 
+    40cfbc      8 DATAREF STACK 990 esp + 32 CHILDOF 986 OFFSET 32 LOCALVAR var_18 
+    40cfbc      8 DATAREF STACK 991 esp + 40 CHILDOF 986 OFFSET 40 LOCALVAR var_10 
+    40cfbc      8 DATAREF STACK 992 esp + 48 CHILDOF 986 OFFSET 48 LOCALVAR var_8 
+    40cfbc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
+    40cfc0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
+    40cfc0      3 INSTR BELONGTO 40cf90 
+    40cfc3      3 INSTR BELONGTO 40cf90 
+    40cfc3      3 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ mov     r13d, edi 
+    40cfc6      3 INSTR BELONGTO 40cf90 
+    40cfc6      3 INSTR DEADREGS  EFLAGS EBX R14 R15 ZZ mov     r14, rsi 
+    40cfc9     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+    40cfc9      4 INSTR BELONGTO 40cf90 
+    40cfcd      3 INSTR BELONGTO 40cf90 
+    40cfcd      3 INSTR DEADREGS  EFLAGS EBX R15 ZZ mov     r15, rdx 
     40cfd0     -1 INSTR LOCAL NoMetaUpdate call    _init_proc 
+    40cfd0      5 INSTR BELONGTO 40cf90 
+    40cfd0      5 INSTR DEADREGS  EFLAGS EBX ZZ call    _init_proc 
     40cfd5     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
+    40cfd5      3 INSTR BELONGTO 40cf90 
     40cfd8     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40CFF6 
+    40cfd8      2 INSTR BELONGTO 40cf90 
+    40cfda      2 INSTR BELONGTO 40cf90 
+    40cfda      2 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ xor     ebx, ebx 
     40cfda     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+    40cfdc      4 INSTR BELONGTO 40cf90 
+    40cfe0      3 INSTR BELONGTO 40cf90 
+    40cfe0      3 INSTR DEADREGS  EFLAGS EDX ESI EDI ZZ mov     rdx, r15 
+    40cfe3      3 INSTR BELONGTO 40cf90 
+    40cfe3      3 INSTR DEADREGS  EFLAGS ESI EDI ZZ mov     rsi, r14 
+    40cfe6      3 INSTR BELONGTO 40cf90 
+    40cfe6      3 INSTR DEADREGS  EFLAGS EDI ZZ mov     edi, r13d 
     40cfe9     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [r12+rbx*8] 
+    40cfe9      4 INSTR BELONGTO 40cf90 
     40cfed     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbx, 1 
+    40cfed      4 INSTR BELONGTO 40cf90 
     40cff1     -1 INSTR LOCAL NoMetaUpdate cmp     rbx, rbp 
+    40cff1      3 INSTR BELONGTO 40cf90 
     40cff4     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40CFE0 
-    40cff6      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
-    40cffb      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
-    40d000      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
-    40d005      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
-    40d00a      5 PTRIMMEDESP STACK 40 displ mov     r14, [rsp+28h]
-    40d00f      5 PTRIMMEDESP STACK 48 displ mov     r15, [rsp+30h]
+    40cff4      2 INSTR BELONGTO 40cf90 
+    40cff6      5 INSTR BELONGTO 40cf90 
+    40cff6      5 INSTR DEADREGS  EFLAGS EBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbx, [rsp+38h+var_30] 
+    40cff6      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+38h+var_30]
+    40cffb      5 INSTR BELONGTO 40cf90 
+    40cffb      5 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbp, [rsp+38h+var_28] 
+    40cffb      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+38h+var_28]
+    40d000     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+38h+var_20] 
+    40d000      5 INSTR BELONGTO 40cf90 
+    40d005     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+38h+var_18] 
+    40d005      5 INSTR BELONGTO 40cf90 
+    40d00a     -1 INSTR LOCAL MetadataUnused mov     r14, [rsp+38h+var_10] 
+    40d00a      5 INSTR BELONGTO 40cf90 
+    40d00f     -1 INSTR LOCAL MetadataUnused mov     r15, [rsp+38h+var_8] 
+    40d00f      5 INSTR BELONGTO 40cf90 
     40d014     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
+    40d014      4 INSTR BELONGTO 40cf90 
+    40d018      1 INSTR BELONGTO 40cf90 
+    40d018      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
+    40d018     56 DEALLOC STACK esp - 56 retn
     40d020      0 FUNC FRAMERESTORE 0 0 0 1 0 1 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     40d020      0 FUNC MMSAFENESS SAFE
     40d020      2 FUNC GLOBAL fini FUNC_SAFE NOFP RET FUNC_LEAF     40d021 
@@ -15526,7 +15595,7 @@
     40d034     -3 INSTR LOCAL NoWarn push    rbx 
     40d035      4 INSTR BELONGTO 40d030 
     40d035      4 INSTR DEADREGS  EFLAGS EAX EBX ZZ sub     rsp, 8 
-    40d035      8 DATAREF STACK 986 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d035      8 DATAREF STACK 993 esp + 0 PARENT LocalFrame LOCALFRAME
     40d035      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     40d035      8 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40d039      7 INSTR BELONGTO 40d030 
@@ -15562,7 +15631,7 @@
     40d068     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     40d075 
     40d068      4 INSTR BELONGTO 40d068 
     40d068      4 INSTR DEADREGS  EFLAGS EAX ECX EDX ESI EDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    40d068      8 DATAREF STACK 987 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d068      8 DATAREF STACK 994 esp + 0 PARENT LocalFrame LOCALFRAME
     40d068      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40d06c     -1 INSTR LOCAL NoMetaUpdate call    sub_4068A0 
     40d06c      5 INSTR BELONGTO 40d068 
diff --git a/tests/commit/trimmed-sorted-save-gnome-system-log.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-system-log.psexe.annot
index 590f02ce..4728bb3e 100644
--- a/tests/commit/trimmed-sorted-save-gnome-system-log.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-system-log.psexe.annot
@@ -4108,9 +4108,9 @@
     409dcf     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     409dcf      7 INSTR BELONGTO 409dc0 
     409dcf      7 INSTR DEADREGS  EFLAGS ECX EDI R8 ZZ mov     r8, offset fini ; fini 
-    409dd6     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; "H‰l$ØL‰d$àH-ÃM " 
+    409dd6     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; init 
     409dd6      7 INSTR BELONGTO 409dc0 
-    409dd6      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; "H‰l$ØL‰d$àH-ÃM " 
+    409dd6      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; init 
     409ddd     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, offset main; main 
     409ddd      7 INSTR BELONGTO 409dc0 
     409ddd      7 INSTR DEADREGS  EFLAGS EDI ZZ mov     rdi, offset main; main 
@@ -21068,26 +21068,95 @@
     413fa2     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_413F66 
     413fa4      4 PTRIMMEDEBP STACK 32 displ mov     rbx, [rbp+20h]
     413fa8     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_413F66 
-    413fc8      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], r13
-    413fcd      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r14
-    413fd2      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r15
-    413fd7      5 PTRIMMEDESP STACK -48 displ mov     [rsp-30h], rbx
-    413fe9     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
+    413fb0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+    413fb0      0 FUNC MMSAFENESS SPECSAFE
+    413fb0    137 FUNC GLOBAL init FUNC_UNSAFE NOFP RET     414038 
+    413fb0      5 INSTR BELONGTO 413fb0 
+    413fb0      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_28], rbp 
+    413fb0      5 PTRIMMEDESP STACK -40 displ mov     [rsp+var_28], rbp
+    413fb5      5 INSTR BELONGTO 413fb0 
+    413fb5      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
+    413fb5      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
+    413fba     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:618D84h 
+    413fba      7 INSTR BELONGTO 413fb0 
+    413fc1      7 INSTR BELONGTO 413fb0 
+    413fc1      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     r12, cs:618D84h 
+    413fc8      5 INSTR BELONGTO 413fb0 
+    413fc8      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_18], r13 
+    413fc8      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], r13
+    413fcd      5 INSTR BELONGTO 413fb0 
+    413fcd      5 INSTR DEADREGS  EFLAGS R13 ZZ mov     [rsp+var_10], r14 
+    413fcd      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], r14
+    413fd2      5 INSTR BELONGTO 413fb0 
+    413fd2      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ mov     [rsp+var_8], r15 
+    413fd2      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
+    413fd7      5 INSTR BELONGTO 413fb0 
+    413fd7      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ mov     [rsp+var_30], rbx 
+    413fd7      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
+    413fdc      4 INSTR BELONGTO 413fb0 
+    413fdc      4 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ sub     rsp, 38h 
+    413fdc     56 DATAREF STACK 1494 esp + 0 PARENT LocalFrame LOCALFRAME
+    413fdc      8 DATAREF STACK 1495 esp + 8 CHILDOF 1494 OFFSET 8 LOCALVAR var_30 
+    413fdc      8 DATAREF STACK 1496 esp + 16 CHILDOF 1494 OFFSET 16 LOCALVAR var_28 
+    413fdc      8 DATAREF STACK 1497 esp + 24 CHILDOF 1494 OFFSET 24 LOCALVAR var_20 
+    413fdc      8 DATAREF STACK 1498 esp + 32 CHILDOF 1494 OFFSET 32 LOCALVAR var_18 
+    413fdc      8 DATAREF STACK 1499 esp + 40 CHILDOF 1494 OFFSET 40 LOCALVAR var_10 
+    413fdc      8 DATAREF STACK 1500 esp + 48 CHILDOF 1494 OFFSET 48 LOCALVAR var_8 
+    413fdc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
+    413fe0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
+    413fe0      3 INSTR BELONGTO 413fb0 
+    413fe3      3 INSTR BELONGTO 413fb0 
+    413fe3      3 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ mov     r13d, edi 
+    413fe6      3 INSTR BELONGTO 413fb0 
+    413fe6      3 INSTR DEADREGS  EFLAGS EBX R14 R15 ZZ mov     r14, rsi 
+    413fe9     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+    413fe9      4 INSTR BELONGTO 413fb0 
+    413fed      3 INSTR BELONGTO 413fb0 
+    413fed      3 INSTR DEADREGS  EFLAGS EBX R15 ZZ mov     r15, rdx 
     413ff0     -1 INSTR LOCAL NoMetaUpdate call    _init_proc 
+    413ff0      5 INSTR BELONGTO 413fb0 
+    413ff0      5 INSTR DEADREGS  EFLAGS EBX ZZ call    _init_proc 
     413ff5     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
+    413ff5      3 INSTR BELONGTO 413fb0 
     413ff8     -1 INSTR LOCAL NoMetaUpdate jz      short loc_414016 
+    413ff8      2 INSTR BELONGTO 413fb0 
+    413ffa      2 INSTR BELONGTO 413fb0 
+    413ffa      2 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ xor     ebx, ebx 
     413ffa     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+    413ffc      4 INSTR BELONGTO 413fb0 
+    414000      3 INSTR BELONGTO 413fb0 
+    414000      3 INSTR DEADREGS  EFLAGS EDX ESI EDI ZZ mov     rdx, r15 
+    414003      3 INSTR BELONGTO 413fb0 
+    414003      3 INSTR DEADREGS  EFLAGS ESI EDI ZZ mov     rsi, r14 
+    414006      3 INSTR BELONGTO 413fb0 
+    414006      3 INSTR DEADREGS  EFLAGS EDI ZZ mov     edi, r13d 
     414009     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [r12+rbx*8] 
+    414009      4 INSTR BELONGTO 413fb0 
     41400d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbx, 1 
+    41400d      4 INSTR BELONGTO 413fb0 
     414011     -1 INSTR LOCAL NoMetaUpdate cmp     rbx, rbp 
+    414011      3 INSTR BELONGTO 413fb0 
     414014     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_414000 
-    414016      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
-    41401b      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
-    414020      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
-    414025      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
-    41402a      5 PTRIMMEDESP STACK 40 displ mov     r14, [rsp+28h]
-    41402f      5 PTRIMMEDESP STACK 48 displ mov     r15, [rsp+30h]
+    414014      2 INSTR BELONGTO 413fb0 
+    414016      5 INSTR BELONGTO 413fb0 
+    414016      5 INSTR DEADREGS  EFLAGS EBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbx, [rsp+38h+var_30] 
+    414016      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+38h+var_30]
+    41401b      5 INSTR BELONGTO 413fb0 
+    41401b      5 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbp, [rsp+38h+var_28] 
+    41401b      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+38h+var_28]
+    414020     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+38h+var_20] 
+    414020      5 INSTR BELONGTO 413fb0 
+    414025     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+38h+var_18] 
+    414025      5 INSTR BELONGTO 413fb0 
+    41402a     -1 INSTR LOCAL MetadataUnused mov     r14, [rsp+38h+var_10] 
+    41402a      5 INSTR BELONGTO 413fb0 
+    41402f     -1 INSTR LOCAL MetadataUnused mov     r15, [rsp+38h+var_8] 
+    41402f      5 INSTR BELONGTO 413fb0 
     414034     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
+    414034      4 INSTR BELONGTO 413fb0 
+    414038      1 INSTR BELONGTO 413fb0 
+    414038      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
+    414038     56 DEALLOC STACK esp - 56 retn
     414040      0 FUNC FRAMERESTORE 0 0 0 1 0 1 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     414040      0 FUNC MMSAFENESS SAFE
     414040      2 FUNC GLOBAL fini FUNC_SAFE NOFP RET FUNC_LEAF     414041 
@@ -21108,7 +21177,7 @@
     414054     -3 INSTR LOCAL NoWarn push    rbx 
     414055      4 INSTR BELONGTO 414050 
     414055      4 INSTR DEADREGS  EFLAGS EAX EBX ZZ sub     rsp, 8 
-    414055      8 DATAREF STACK 1494 esp + 0 PARENT LocalFrame LOCALFRAME
+    414055      8 DATAREF STACK 1501 esp + 0 PARENT LocalFrame LOCALFRAME
     414055      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     414055      8 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     414059      7 INSTR BELONGTO 414050 
@@ -21144,7 +21213,7 @@
     414088     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     414095 
     414088      4 INSTR BELONGTO 414088 
     414088      4 INSTR DEADREGS  EFLAGS EAX ECX EDX ESI EDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    414088      8 DATAREF STACK 1495 esp + 0 PARENT LocalFrame LOCALFRAME
+    414088      8 DATAREF STACK 1502 esp + 0 PARENT LocalFrame LOCALFRAME
     414088      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     41408c     -1 INSTR LOCAL NoMetaUpdate call    sub_409E10 
     41408c      5 INSTR BELONGTO 414088 
diff --git a/tests/commit/trimmed-sorted-save-gnome-system-monitor.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gnome-system-monitor.psexe.annot.REMOVED.git-id
index 46e97bb7..05b04361 100644
--- a/tests/commit/trimmed-sorted-save-gnome-system-monitor.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gnome-system-monitor.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-993feeade55ec151bc0231a28a199013663c687d
\ No newline at end of file
+5a1239d1aa6934d7b8e08e1cb12b48f3dcd88ac2
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-grep.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-grep.psexe.annot.REMOVED.git-id
index 7897d045..95a05f0a 100644
--- a/tests/commit/trimmed-sorted-save-grep.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-grep.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-d6458689aed8543566808a60248ee4f94f9e634e
\ No newline at end of file
+7f33648e0bac732eabf5d190e5c6e0a0f6269952
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-httpd.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-httpd.psexe.annot.REMOVED.git-id
index 5a4eaedd..587820ea 100644
--- a/tests/commit/trimmed-sorted-save-httpd.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-httpd.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-911402d2581eced43aa73a54c8c5aa5bc9e3c365
\ No newline at end of file
+d592f2c7478b6bf72d4643423ab47b62f2cd6d09
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-less.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-less.psexe.annot.REMOVED.git-id
index b96be918..afc757d7 100644
--- a/tests/commit/trimmed-sorted-save-less.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-less.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-342b39bf0342cd5eaa57cdaca594da58068ffb5d
\ No newline at end of file
+1f901574e70ee343d1c8ad23bb03229780dae0c3
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-ls-64bit.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-ls-64bit.psexe.annot.REMOVED.git-id
index 160a1459..cf169b75 100644
--- a/tests/commit/trimmed-sorted-save-ls-64bit.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-ls-64bit.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-b2b75ea9255ce188262e2d3bee3c14d14f0dd394
\ No newline at end of file
+3c7a1bab292d92d7c03b6923cb354df400688528
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-lt-svn.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-lt-svn.psexe.annot.REMOVED.git-id
index 8f3f2263..7920ebba 100644
--- a/tests/commit/trimmed-sorted-save-lt-svn.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-lt-svn.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-0d7cbe8a698f1ded02084f0f01d12cdb866a20e5
\ No newline at end of file
+e391880d9333c6f3687a8c0ad2538169bcfd588c
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-nginx.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-nginx.psexe.annot.REMOVED.git-id
index 91deb635..e78e1f1b 100644
--- a/tests/commit/trimmed-sorted-save-nginx.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-nginx.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-36a78630baa11b2b936559eaea7dfb9c432cf9d9
\ No newline at end of file
+96e64504c75d2dac8fa96e273eaf82d6d2d9df7c
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-openssl.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-openssl.psexe.annot.REMOVED.git-id
index 2f177c45..d7d93b37 100644
--- a/tests/commit/trimmed-sorted-save-openssl.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-openssl.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-89c91f7883791520be411abfd88ab2f50ed3f5d4
\ No newline at end of file
+bec611734dfca244d5485fa2dddd0fd72c8941b9
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-synaptic.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-synaptic.psexe.annot.REMOVED.git-id
index d103b3ca..43319237 100644
--- a/tests/commit/trimmed-sorted-save-synaptic.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-synaptic.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-ebe50d0a4199aaa3c8148c57ace400b71b41b2c0
\ No newline at end of file
+4b067c4f6f1c43045de5b53b4c3d8908044407ab
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-xedit.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-xedit.psexe.annot.REMOVED.git-id
index 3e601e2d..aeeecfec 100644
--- a/tests/commit/trimmed-sorted-save-xedit.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-xedit.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-45c83fda618c5d8b2788cfb374a9b6c3a70a6692
\ No newline at end of file
+a8e715832d1f76b07f0a1bb48b68f9e166f746e0
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-xeyes.psexe.annot b/tests/commit/trimmed-sorted-save-xeyes.psexe.annot
index 0273cc94..f7f7b4cb 100644
--- a/tests/commit/trimmed-sorted-save-xeyes.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-xeyes.psexe.annot
@@ -845,9 +845,9 @@
     4018e3     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     4018e3      7 INSTR BELONGTO 4018d4 
     4018e3      7 INSTR DEADREGS  EFLAGS ECX EDI R8 ZZ mov     r8, offset fini ; fini 
-    4018ea     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; "H‰l$ØL‰d$àH-C\r " 
+    4018ea     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; init 
     4018ea      7 INSTR BELONGTO 4018d4 
-    4018ea      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; "H‰l$ØL‰d$àH-C\r " 
+    4018ea      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; init 
     4018f1     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, offset main; main 
     4018f1      7 INSTR BELONGTO 4018d4 
     4018f1      7 INSTR DEADREGS  EFLAGS EDI ZZ mov     rdi, offset main; main 
@@ -3254,26 +3254,95 @@
     403068     -1 INSTR LOCAL NoMetaUpdate call    _exit 
     403068      5 INSTR BELONGTO 403030 
     403068      5 INSTR DEADREGS  EFLAGS ZZ call    _exit 
-    403088      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], r13
-    40308d      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r14
-    403092      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r15
-    403097      5 PTRIMMEDESP STACK -48 displ mov     [rsp-30h], rbx
-    4030a9     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
+    403070      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+    403070      0 FUNC MMSAFENESS SPECSAFE
+    403070    137 FUNC GLOBAL init FUNC_UNSAFE NOFP RET     4030f8 
+    403070      5 INSTR BELONGTO 403070 
+    403070      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_28], rbp 
+    403070      5 PTRIMMEDESP STACK -40 displ mov     [rsp+var_28], rbp
+    403075      5 INSTR BELONGTO 403070 
+    403075      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
+    403075      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
+    40307a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:603DC4h 
+    40307a      7 INSTR BELONGTO 403070 
+    403081      7 INSTR BELONGTO 403070 
+    403081      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     r12, cs:603DC4h 
+    403088      5 INSTR BELONGTO 403070 
+    403088      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_18], r13 
+    403088      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], r13
+    40308d      5 INSTR BELONGTO 403070 
+    40308d      5 INSTR DEADREGS  EFLAGS R13 ZZ mov     [rsp+var_10], r14 
+    40308d      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], r14
+    403092      5 INSTR BELONGTO 403070 
+    403092      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ mov     [rsp+var_8], r15 
+    403092      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
+    403097      5 INSTR BELONGTO 403070 
+    403097      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ mov     [rsp+var_30], rbx 
+    403097      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
+    40309c      4 INSTR BELONGTO 403070 
+    40309c      4 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ sub     rsp, 38h 
+    40309c     56 DATAREF STACK 292 esp + 0 PARENT LocalFrame LOCALFRAME
+    40309c      8 DATAREF STACK 293 esp + 8 CHILDOF 292 OFFSET 8 LOCALVAR var_30 
+    40309c      8 DATAREF STACK 294 esp + 16 CHILDOF 292 OFFSET 16 LOCALVAR var_28 
+    40309c      8 DATAREF STACK 295 esp + 24 CHILDOF 292 OFFSET 24 LOCALVAR var_20 
+    40309c      8 DATAREF STACK 296 esp + 32 CHILDOF 292 OFFSET 32 LOCALVAR var_18 
+    40309c      8 DATAREF STACK 297 esp + 40 CHILDOF 292 OFFSET 40 LOCALVAR var_10 
+    40309c      8 DATAREF STACK 298 esp + 48 CHILDOF 292 OFFSET 48 LOCALVAR var_8 
+    40309c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
+    4030a0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
+    4030a0      3 INSTR BELONGTO 403070 
+    4030a3      3 INSTR BELONGTO 403070 
+    4030a3      3 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ mov     r13d, edi 
+    4030a6      3 INSTR BELONGTO 403070 
+    4030a6      3 INSTR DEADREGS  EFLAGS EBX R14 R15 ZZ mov     r14, rsi 
+    4030a9     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+    4030a9      4 INSTR BELONGTO 403070 
+    4030ad      3 INSTR BELONGTO 403070 
+    4030ad      3 INSTR DEADREGS  EFLAGS EBX R15 ZZ mov     r15, rdx 
     4030b0     -1 INSTR LOCAL NoMetaUpdate call    _init_proc 
+    4030b0      5 INSTR BELONGTO 403070 
+    4030b0      5 INSTR DEADREGS  EFLAGS EBX ZZ call    _init_proc 
     4030b5     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
+    4030b5      3 INSTR BELONGTO 403070 
     4030b8     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4030D6 
+    4030b8      2 INSTR BELONGTO 403070 
+    4030ba      2 INSTR BELONGTO 403070 
+    4030ba      2 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ xor     ebx, ebx 
     4030ba     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+    4030bc      4 INSTR BELONGTO 403070 
+    4030c0      3 INSTR BELONGTO 403070 
+    4030c0      3 INSTR DEADREGS  EFLAGS EDX ESI EDI ZZ mov     rdx, r15 
+    4030c3      3 INSTR BELONGTO 403070 
+    4030c3      3 INSTR DEADREGS  EFLAGS ESI EDI ZZ mov     rsi, r14 
+    4030c6      3 INSTR BELONGTO 403070 
+    4030c6      3 INSTR DEADREGS  EFLAGS EDI ZZ mov     edi, r13d 
     4030c9     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [r12+rbx*8] 
+    4030c9      4 INSTR BELONGTO 403070 
     4030cd     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbx, 1 
+    4030cd      4 INSTR BELONGTO 403070 
     4030d1     -1 INSTR LOCAL NoMetaUpdate cmp     rbx, rbp 
+    4030d1      3 INSTR BELONGTO 403070 
     4030d4     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4030C0 
-    4030d6      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
-    4030db      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
-    4030e0      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
-    4030e5      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
-    4030ea      5 PTRIMMEDESP STACK 40 displ mov     r14, [rsp+28h]
-    4030ef      5 PTRIMMEDESP STACK 48 displ mov     r15, [rsp+30h]
+    4030d4      2 INSTR BELONGTO 403070 
+    4030d6      5 INSTR BELONGTO 403070 
+    4030d6      5 INSTR DEADREGS  EFLAGS EBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbx, [rsp+38h+var_30] 
+    4030d6      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+38h+var_30]
+    4030db      5 INSTR BELONGTO 403070 
+    4030db      5 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbp, [rsp+38h+var_28] 
+    4030db      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+38h+var_28]
+    4030e0     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+38h+var_20] 
+    4030e0      5 INSTR BELONGTO 403070 
+    4030e5     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+38h+var_18] 
+    4030e5      5 INSTR BELONGTO 403070 
+    4030ea     -1 INSTR LOCAL MetadataUnused mov     r14, [rsp+38h+var_10] 
+    4030ea      5 INSTR BELONGTO 403070 
+    4030ef     -1 INSTR LOCAL MetadataUnused mov     r15, [rsp+38h+var_8] 
+    4030ef      5 INSTR BELONGTO 403070 
     4030f4     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
+    4030f4      4 INSTR BELONGTO 403070 
+    4030f8      1 INSTR BELONGTO 403070 
+    4030f8      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
+    4030f8     56 DEALLOC STACK esp - 56 retn
     403100      0 FUNC FRAMERESTORE 0 0 0 1 0 1 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     403100      0 FUNC MMSAFENESS SAFE
     403100      2 FUNC GLOBAL fini FUNC_SAFE NOFP RET FUNC_LEAF     403101 
@@ -3294,7 +3363,7 @@
     403114     -3 INSTR LOCAL NoWarn push    rbx 
     403115      4 INSTR BELONGTO 403110 
     403115      4 INSTR DEADREGS  EFLAGS EAX EBX ZZ sub     rsp, 8 
-    403115      8 DATAREF STACK 292 esp + 0 PARENT LocalFrame LOCALFRAME
+    403115      8 DATAREF STACK 299 esp + 0 PARENT LocalFrame LOCALFRAME
     403115      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     403115      8 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     403119      7 INSTR BELONGTO 403110 
@@ -3330,7 +3399,7 @@
     403148     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     403155 
     403148      4 INSTR BELONGTO 403148 
     403148      4 INSTR DEADREGS  EFLAGS EAX ECX EDX ESI EDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    403148      8 DATAREF STACK 293 esp + 0 PARENT LocalFrame LOCALFRAME
+    403148      8 DATAREF STACK 300 esp + 0 PARENT LocalFrame LOCALFRAME
     403148      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40314c     -1 INSTR LOCAL NoMetaUpdate call    sub_401920 
     40314c      5 INSTR BELONGTO 403148 
diff --git a/tests/quick/save-bzip2.psexe.infoannot b/tests/quick/save-bzip2.psexe.infoannot
index 8462e17f..e9f11c1a 100644
--- a/tests/quick/save-bzip2.psexe.infoannot
+++ b/tests/quick/save-bzip2.psexe.infoannot
@@ -174,6 +174,9 @@
     403c00    739 FUNC INARGS    6  ARG0 96 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     403ef0   1607 FUNC RETURNTYPE RAX 1
     403ef0   1607 FUNC INARGS    6  ARG0 96 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    404540    137 FUNC RETURNTYPE RAX 0
+    404540    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    404540    137 FUNC PROBLEM init CALLUNRESOLVED 
     4045d0      2 FUNC RETURNTYPE RAX 0
     4045d0      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
     4045e0     54 FUNC RETURNTYPE RAX 0
diff --git a/tests/quick/trimmed-sorted-save-bzip2.psexe.annot b/tests/quick/trimmed-sorted-save-bzip2.psexe.annot
index db328f78..b9244fe3 100644
--- a/tests/quick/trimmed-sorted-save-bzip2.psexe.annot
+++ b/tests/quick/trimmed-sorted-save-bzip2.psexe.annot
@@ -1829,9 +1829,9 @@
     401e03     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     401e03      7 INSTR BELONGTO 401df4 
     401e03      7 INSTR DEADREGS  EFLAGS ECX EDI R8 ZZ mov     r8, offset fini ; fini 
-    401e0a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; "H‰l$ØL‰d$àH-Ã( " 
+    401e0a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, offset init; init 
     401e0a      7 INSTR BELONGTO 401df4 
-    401e0a      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; "H‰l$ØL‰d$àH-Ã( " 
+    401e0a      7 INSTR DEADREGS  EFLAGS ECX EDI ZZ mov     rcx, offset init; init 
     401e11     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, offset main; main 
     401e11      7 INSTR BELONGTO 401df4 
     401e11      7 INSTR DEADREGS  EFLAGS EDI ZZ mov     rdi, offset main; main 
@@ -7016,26 +7016,95 @@
     404532     -1 INSTR LOCAL NoMetaUpdate call    sub_4023C0 
     404532      5 INSTR BELONGTO 403ef0 
     404532      5 INSTR DEADREGS  EFLAGS EAX ECX EDX EBX ESI R8 ZZ call    sub_4023C0 
-    404558      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], r13
-    40455d      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r14
-    404562      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r15
-    404567      5 PTRIMMEDESP STACK -48 displ mov     [rsp-30h], rbx
-    404579     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
+    404540      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+    404540      0 FUNC MMSAFENESS SPECSAFE
+    404540    137 FUNC GLOBAL init FUNC_UNSAFE NOFP RET     4045c8 
+    404540      5 INSTR BELONGTO 404540 
+    404540      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_28], rbp 
+    404540      5 PTRIMMEDESP STACK -40 displ mov     [rsp+var_28], rbp
+    404545      5 INSTR BELONGTO 404540 
+    404545      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
+    404545      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
+    40454a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:606E14h 
+    40454a      7 INSTR BELONGTO 404540 
+    404551      7 INSTR BELONGTO 404540 
+    404551      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     r12, cs:606E14h 
+    404558      5 INSTR BELONGTO 404540 
+    404558      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_18], r13 
+    404558      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], r13
+    40455d      5 INSTR BELONGTO 404540 
+    40455d      5 INSTR DEADREGS  EFLAGS R13 ZZ mov     [rsp+var_10], r14 
+    40455d      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], r14
+    404562      5 INSTR BELONGTO 404540 
+    404562      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ mov     [rsp+var_8], r15 
+    404562      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
+    404567      5 INSTR BELONGTO 404540 
+    404567      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ mov     [rsp+var_30], rbx 
+    404567      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
+    40456c      4 INSTR BELONGTO 404540 
+    40456c      4 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ sub     rsp, 38h 
+    40456c     56 DATAREF STACK 371 esp + 0 PARENT LocalFrame LOCALFRAME
+    40456c      8 DATAREF STACK 372 esp + 8 CHILDOF 371 OFFSET 8 LOCALVAR var_30 
+    40456c      8 DATAREF STACK 373 esp + 16 CHILDOF 371 OFFSET 16 LOCALVAR var_28 
+    40456c      8 DATAREF STACK 374 esp + 24 CHILDOF 371 OFFSET 24 LOCALVAR var_20 
+    40456c      8 DATAREF STACK 375 esp + 32 CHILDOF 371 OFFSET 32 LOCALVAR var_18 
+    40456c      8 DATAREF STACK 376 esp + 40 CHILDOF 371 OFFSET 40 LOCALVAR var_10 
+    40456c      8 DATAREF STACK 377 esp + 48 CHILDOF 371 OFFSET 48 LOCALVAR var_8 
+    40456c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
+    404570     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
+    404570      3 INSTR BELONGTO 404540 
+    404573      3 INSTR BELONGTO 404540 
+    404573      3 INSTR DEADREGS  EFLAGS EBX R13 R14 R15 ZZ mov     r13d, edi 
+    404576      3 INSTR BELONGTO 404540 
+    404576      3 INSTR DEADREGS  EFLAGS EBX R14 R15 ZZ mov     r14, rsi 
+    404579     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+    404579      4 INSTR BELONGTO 404540 
+    40457d      3 INSTR BELONGTO 404540 
+    40457d      3 INSTR DEADREGS  EFLAGS EBX R15 ZZ mov     r15, rdx 
     404580     -1 INSTR LOCAL NoMetaUpdate call    _init_proc 
+    404580      5 INSTR BELONGTO 404540 
+    404580      5 INSTR DEADREGS  EFLAGS EBX ZZ call    _init_proc 
     404585     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
+    404585      3 INSTR BELONGTO 404540 
     404588     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4045A6 
+    404588      2 INSTR BELONGTO 404540 
+    40458a      2 INSTR BELONGTO 404540 
+    40458a      2 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ xor     ebx, ebx 
     40458a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+    40458c      4 INSTR BELONGTO 404540 
+    404590      3 INSTR BELONGTO 404540 
+    404590      3 INSTR DEADREGS  EFLAGS EDX ESI EDI ZZ mov     rdx, r15 
+    404593      3 INSTR BELONGTO 404540 
+    404593      3 INSTR DEADREGS  EFLAGS ESI EDI ZZ mov     rsi, r14 
+    404596      3 INSTR BELONGTO 404540 
+    404596      3 INSTR DEADREGS  EFLAGS EDI ZZ mov     edi, r13d 
     404599     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [r12+rbx*8] 
+    404599      4 INSTR BELONGTO 404540 
     40459d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbx, 1 
+    40459d      4 INSTR BELONGTO 404540 
     4045a1     -1 INSTR LOCAL NoMetaUpdate cmp     rbx, rbp 
+    4045a1      3 INSTR BELONGTO 404540 
     4045a4     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_404590 
-    4045a6      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
-    4045ab      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
-    4045b0      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
-    4045b5      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
-    4045ba      5 PTRIMMEDESP STACK 40 displ mov     r14, [rsp+28h]
-    4045bf      5 PTRIMMEDESP STACK 48 displ mov     r15, [rsp+30h]
+    4045a4      2 INSTR BELONGTO 404540 
+    4045a6      5 INSTR BELONGTO 404540 
+    4045a6      5 INSTR DEADREGS  EFLAGS EBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbx, [rsp+38h+var_30] 
+    4045a6      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+38h+var_30]
+    4045ab      5 INSTR BELONGTO 404540 
+    4045ab      5 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbp, [rsp+38h+var_28] 
+    4045ab      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+38h+var_28]
+    4045b0     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+38h+var_20] 
+    4045b0      5 INSTR BELONGTO 404540 
+    4045b5     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+38h+var_18] 
+    4045b5      5 INSTR BELONGTO 404540 
+    4045ba     -1 INSTR LOCAL MetadataUnused mov     r14, [rsp+38h+var_10] 
+    4045ba      5 INSTR BELONGTO 404540 
+    4045bf     -1 INSTR LOCAL MetadataUnused mov     r15, [rsp+38h+var_8] 
+    4045bf      5 INSTR BELONGTO 404540 
     4045c4     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
+    4045c4      4 INSTR BELONGTO 404540 
+    4045c8      1 INSTR BELONGTO 404540 
+    4045c8      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
+    4045c8     56 DEALLOC STACK esp - 56 retn
     4045d0      0 FUNC FRAMERESTORE 0 0 0 1 0 1 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     4045d0      0 FUNC MMSAFENESS SAFE
     4045d0      2 FUNC GLOBAL fini FUNC_SAFE NOFP RET FUNC_LEAF     4045d1 
@@ -7056,7 +7125,7 @@
     4045e4     -3 INSTR LOCAL NoWarn push    rbx 
     4045e5      4 INSTR BELONGTO 4045e0 
     4045e5      4 INSTR DEADREGS  EFLAGS EAX EBX ZZ sub     rsp, 8 
-    4045e5      8 DATAREF STACK 371 esp + 0 PARENT LocalFrame LOCALFRAME
+    4045e5      8 DATAREF STACK 378 esp + 0 PARENT LocalFrame LOCALFRAME
     4045e5      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     4045e5      8 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4045e9      7 INSTR BELONGTO 4045e0 
@@ -7092,7 +7161,7 @@
     404618     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     404625 
     404618      4 INSTR BELONGTO 404618 
     404618      4 INSTR DEADREGS  EFLAGS EAX ECX EDX ESI EDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    404618      8 DATAREF STACK 372 esp + 0 PARENT LocalFrame LOCALFRAME
+    404618      8 DATAREF STACK 379 esp + 0 PARENT LocalFrame LOCALFRAME
     404618      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40461c     -1 INSTR LOCAL NoMetaUpdate call    sub_401E40 
     40461c      5 INSTR BELONGTO 404618 
-- 
GitLab