Skip to content

Commit

Permalink
updated to r1834 from svn repo
Browse files Browse the repository at this point in the history
  • Loading branch information
irmen committed Jan 27, 2019
1 parent 5a1ba03 commit 6741837
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
12 changes: 8 additions & 4 deletions 64tass.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Turbo Assembler 6502/65C02/65816/DTV
$Id: 64tass.c 1832 2019-01-26 09:06:41Z soci $
$Id: 64tass.c 1833 2019-01-26 18:53:24Z soci $
6502/65C02 Turbo Assembler Version 1.3
(c) 1996 Taboo Productions, Marek Matula
Expand Down Expand Up @@ -765,9 +765,13 @@ static bool byterecursion(Obj *val, int prm, address_t *uninit, int bits) {
}
if (*uninit != 0) {memskip(*uninit);*uninit = 0;}
pokeb(ch2);
if (prm>=CMD_RTA) pokeb(ch2 >> 8);
if (prm>=CMD_LINT) pokeb(ch2 >> 16);
if (prm>=CMD_DINT) pokeb(ch2 >> 24);
if (prm >= CMD_RTA) {
pokeb(ch2 >> 8);
if (prm >= CMD_LINT) {
pokeb(ch2 >> 16);
if (prm >= CMD_DINT) pokeb(ch2 >> 24);
}
}
if (iter == NULL) return warn;
}
val_destroy(&iter->v);
Expand Down
3 changes: 2 additions & 1 deletion isnprintf.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Version 1.3
Adapted for use in 64tass by Soci/Singular
$Id: isnprintf.c 1818 2019-01-13 20:30:50Z soci $
$Id: isnprintf.c 1834 2019-01-26 22:15:13Z soci $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published by
Expand Down Expand Up @@ -563,6 +563,7 @@ MUST_CHECK Obj *isnprintf(Funcargs *vals, linepos_t epoint)
error2:
epoint2 = v[0].epoint;
epoint2.pos = interstring_position(&epoint2, ((Str *)val)->data, (size_t)(data.pf - ((Str *)val)->data));
msg.data = data.pf;
if ((c & 0x80) != 0) msg.len = utf8in(data.pf, &c); else msg.len = 1;
err_msg_not_defined(&msg, &epoint2);
err = star_args(&data);
Expand Down

0 comments on commit 6741837

Please sign in to comment.