[decompiler] Make addition nicer (#733)

* temp

* update refs

* update reference

* fix tests
This commit is contained in:
water111
2021-08-01 18:24:58 -04:00
committed by GitHub
parent e70d179496
commit 12446037bd
42 changed files with 294 additions and 536 deletions
@@ -2342,25 +2342,16 @@ TEST_F(FormRegressionTest, ExprStringToInt) {
" (>= (-> a0-3 0) (the-as uint 65))\n"
" (>= (the-as uint 70) (-> a0-3 0))\n"
" )\n"
" (set!\n"
" v0-0\n"
" (the-as int (+ (+ (-> a0-3 0) -55) (the-as uint (* v0-0 16))))\n"
" )\n"
" (set! v0-0 (the-as int (+ (-> a0-3 0) -55 (* v0-0 16))))\n"
" )\n"
" ((and\n"
" (>= (-> a0-3 0) (the-as uint 97))\n"
" (>= (the-as uint 102) (-> a0-3 0))\n"
" )\n"
" (set!\n"
" v0-0\n"
" (the-as int (+ (+ (-> a0-3 0) -87) (the-as uint (* v0-0 16))))\n"
" )\n"
" (set! v0-0 (the-as int (+ (-> a0-3 0) -87 (* v0-0 16))))\n"
" )\n"
" (else\n"
" (set!\n"
" v0-0\n"
" (the-as int (+ (+ (-> a0-3 0) -48) (the-as uint (* v0-0 16))))\n"
" )\n"
" (set! v0-0 (the-as int (+ (-> a0-3 0) -48 (* v0-0 16))))\n"
" )\n"
" )\n"
" (set! a0-3 (&-> a0-3 1))\n"
@@ -2374,10 +2365,7 @@ TEST_F(FormRegressionTest, ExprStringToInt) {
" (>= (-> a0-4 0) (the-as uint 48))\n"
" (>= (the-as uint 49) (-> a0-4 0))\n"
" )\n"
" (set!\n"
" v0-0\n"
" (the-as int (+ (+ (-> a0-4 0) -48) (the-as uint (* v0-0 2))))\n"
" )\n"
" (set! v0-0 (the-as int (+ (-> a0-4 0) -48 (* v0-0 2))))\n"
" (set! a0-4 (&-> a0-4 1))\n"
" )\n"
" )\n"
@@ -2392,7 +2380,7 @@ TEST_F(FormRegressionTest, ExprStringToInt) {
" )\n"
" (while\n"
" (and (>= (-> a0-1 0) (the-as uint 48)) (>= (the-as uint 57) (-> a0-1 0)))\n"
" (set! v0-0 (the-as int (+ (+ (-> a0-1 0) -48) (the-as uint (* 10 v0-0)))))\n"
" (set! v0-0 (the-as int (+ (-> a0-1 0) -48 (* 10 v0-0))))\n"
" (set! a0-1 (&-> a0-1 1))\n"
" )\n"
" )\n"