To: vim_dev@googlegroups.com Subject: Patch 8.2.0439 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0439 Problem: :disassemble has minor flaws. Solution: Format the code. Use (int) instead of (char) for %c. (also by James McCoy, closes #5831) Files: src/vim9execute.c *** ../vim-8.2.0438/src/vim9execute.c 2020-03-23 22:12:15.496961030 +0100 --- src/vim9execute.c 2020-03-23 22:51:26.617183825 +0100 *************** *** 1774,1787 **** } break; case ISN_EXECUTE: ! smsg("%4d EXECUTE %lld", current, (long long)(iptr->isn_arg.number)); break; case ISN_LOAD: if (iptr->isn_arg.number < 0) smsg("%4d LOAD arg[%lld]", current, ! (long long)(iptr->isn_arg.number + STACK_FRAME_SIZE)); else ! smsg("%4d LOAD $%lld", current, (long long)(iptr->isn_arg.number)); break; case ISN_LOADV: smsg("%4d LOADV v:%s", current, --- 1774,1789 ---- } break; case ISN_EXECUTE: ! smsg("%4d EXECUTE %lld", current, ! (long long)(iptr->isn_arg.number)); break; case ISN_LOAD: if (iptr->isn_arg.number < 0) smsg("%4d LOAD arg[%lld]", current, ! (long long)(iptr->isn_arg.number + STACK_FRAME_SIZE)); else ! smsg("%4d LOAD $%lld", current, ! (long long)(iptr->isn_arg.number)); break; case ISN_LOADV: smsg("%4d LOADV v:%s", current, *************** *** 1817,1831 **** smsg("%4d LOADENV %s", current, iptr->isn_arg.string); break; case ISN_LOADREG: ! smsg("%4d LOADREG @%c", current, (char)(iptr->isn_arg.number)); break; case ISN_STORE: if (iptr->isn_arg.number < 0) smsg("%4d STORE arg[%lld]", current, ! (long long)(iptr->isn_arg.number + STACK_FRAME_SIZE)); else ! smsg("%4d STORE $%lld", current, (long long)(iptr->isn_arg.number)); break; case ISN_STOREV: smsg("%4d STOREV v:%s", current, --- 1819,1834 ---- smsg("%4d LOADENV %s", current, iptr->isn_arg.string); break; case ISN_LOADREG: ! smsg("%4d LOADREG @%c", current, (int)(iptr->isn_arg.number)); break; case ISN_STORE: if (iptr->isn_arg.number < 0) smsg("%4d STORE arg[%lld]", current, ! (long long)(iptr->isn_arg.number + STACK_FRAME_SIZE)); else ! smsg("%4d STORE $%lld", current, ! (long long)(iptr->isn_arg.number)); break; case ISN_STOREV: smsg("%4d STOREV v:%s", current, *************** *** 1862,1868 **** smsg("%4d STOREENV $%s", current, iptr->isn_arg.string); break; case ISN_STOREREG: ! smsg("%4d STOREREG @%c", current, (char)iptr->isn_arg.number); break; case ISN_STORENR: smsg("%4d STORE %lld in $%d", current, --- 1865,1871 ---- smsg("%4d STOREENV $%s", current, iptr->isn_arg.string); break; case ISN_STOREREG: ! smsg("%4d STOREREG @%c", current, (int)iptr->isn_arg.number); break; case ISN_STORENR: smsg("%4d STORE %lld in $%d", current, *************** *** 1872,1878 **** // constants case ISN_PUSHNR: ! smsg("%4d PUSHNR %lld", current, (long long)(iptr->isn_arg.number)); break; case ISN_PUSHBOOL: case ISN_PUSHSPEC: --- 1875,1882 ---- // constants case ISN_PUSHNR: ! smsg("%4d PUSHNR %lld", current, ! (long long)(iptr->isn_arg.number)); break; case ISN_PUSHBOOL: case ISN_PUSHSPEC: *************** *** 1941,1950 **** smsg("%4d PUSH v:exception", current); break; case ISN_NEWLIST: ! smsg("%4d NEWLIST size %lld", current, (long long)(iptr->isn_arg.number)); break; case ISN_NEWDICT: ! smsg("%4d NEWDICT size %lld", current, (long long)(iptr->isn_arg.number)); break; // function call --- 1945,1956 ---- smsg("%4d PUSH v:exception", current); break; case ISN_NEWLIST: ! smsg("%4d NEWLIST size %lld", current, ! (long long)(iptr->isn_arg.number)); break; case ISN_NEWDICT: ! smsg("%4d NEWDICT size %lld", current, ! (long long)(iptr->isn_arg.number)); break; // function call *** ../vim-8.2.0438/src/version.c 2020-03-23 22:46:40.794055634 +0100 --- src/version.c 2020-03-23 22:52:58.584901235 +0100 *************** *** 740,741 **** --- 740,743 ---- { /* Add new patch number below this line */ + /**/ + 439, /**/ -- ARTHUR: Will you ask your master if he wants to join my court at Camelot?! GUARD #1: But then of course African swallows are not migratory. GUARD #2: Oh, yeah... GUARD #1: So they couldn't bring a coconut back anyway... The Quest for the Holy Grail (Monty Python) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///