Skip to content

fixed low hanging fruit #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mcrossen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed low hanging fruit #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assembler/ndisasm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ int main(int argc, char **argv)
p++;
break;
case 'h':
fprintf(stderr, help);
fprintf(stderr, "%s", help);
return 0;
case 'r':
case 'v':
Expand Down
2 changes: 1 addition & 1 deletion assembler/output/outieee.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ static void ieee_putascii(char *format, ...)
if ((buffer[i] & 0xff) > 31)
checksum+=buffer[i];
va_end(ap);
fprintf(ofp,buffer);
fprintf(ofp,"%s",buffer);
}

/*
Expand Down
2 changes: 1 addition & 1 deletion compiler/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
* NOTE: This must be a signed value.
*/
#define STP_PTRDIFF stp_int /* ptrdiff_t type; either stp_int or stp_long */
/* 8086 Needs 16-bit pointers. -WSF /*
/* 8086 Needs 16-bit pointers. -WSF */

/*
* The type of a wide character is implementation defined and has an
Expand Down
7 changes: 3 additions & 4 deletions compiler/gen86.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1553,7 +1553,7 @@ static ADDRESS *g_shift P3 (const EXPR *, ep, FLAGS, flags, OPCODE, op)
static ADDRESS *g_asshift P3 (const EXPR *, ep, FLAGS, flags, OPCODE, op)
{
ADDRESS *ap1, *ap2;
EXPR *ep1; FLAGS flgs; // Added for new code below - WSF
FLAGS flgs; // Added for new code below - WSF


switch (ep->etp->type) {
Expand All @@ -1578,9 +1578,8 @@ static ADDRESS *g_asshift P3 (const EXPR *, ep, FLAGS, flags, OPCODE, op)
// code for the 8086 (i.e., uses an immediate operand). The code was
// taken from the g_shift() function. - WSF
ap1 = g_expr (ep->v.p[0], (FLAGS) (F_DREG | F_VOL | F_NOECX));
ep1 = ep->v.p[1];
flgs = (FLAGS) (F_DREG | F_ECX);
ap2 = g_expr (ep->v.p[1], flgs);
flgs = (FLAGS) (F_DREG | F_ECX);
ap2 = g_expr (ep->v.p[1], flgs);
validate (ap1);
g_code (op, (ILEN) ep->etp->size, ap2, ap1);
freeop (ap2);
Expand Down
5 changes: 2 additions & 3 deletions compiler/outx86_n.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,17 +1254,16 @@ PRIVATE void put_rseg P1 (SIZE, al)
put_cseg (al);
}

/* The following isn't supported by NASM. -WSF
static void put_noseg P0 (void)
{
/* The following isn't supported by NASM. -WSF
nl ();
if (curseg != noseg) {
curseg = noseg;
align_type = 0L;
oprintf ("\tassume\tds:nothing%s", newline);
}
*/
}
}*/

PRIVATE void put_finish P0 (void)
{
Expand Down
12 changes: 6 additions & 6 deletions emulator/NasmDisassemble/nasm_disasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,12 +517,12 @@ long disasm (unsigned char *data, char *output, int segsize, long offset,
else if (*data == 0x2E || *data == 0x36 || *data == 0x3E ||
*data == 0x26 || *data == 0x64 || *data == 0x65) {
switch (*data++) {
case 0x2E: segover = "cs"; break;
case 0x36: segover = "ss"; break;
case 0x3E: segover = "ds"; break;
case 0x26: segover = "es"; break;
case 0x64: segover = "fs"; break;
case 0x65: segover = "gs"; break;
case 0x2E: segover = (char *)"cs"; break;
case 0x36: segover = (char *)"ss"; break;
case 0x3E: segover = (char *)"ds"; break;
case 0x26: segover = (char *)"es"; break;
case 0x64: segover = (char *)"fs"; break;
case 0x65: segover = (char *)"gs"; break;
}
} else if (*data == 0x66)
osize = 48 - segsize, data++;
Expand Down
4 changes: 2 additions & 2 deletions emulator/SimWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ bool CSimWindow::InitWindow(void)
// For printing normal strings. It supports \n, \r, \t, and \b correctly.
void CSimWindow::PrintText(const char *string)
{
printf(string);
printf("%s", string);
}


Expand Down Expand Up @@ -90,7 +90,7 @@ int CSimWindow::GetHistory(int dir, char *dest, int clearChars)
// Copy command from history
strcpy(dest, string);
i = strlen(string);
printf(string);
printf("%s", string);

return i;
}
Expand Down
64 changes: 32 additions & 32 deletions emulator/ops2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,68 +88,68 @@ void x86emuOp2_long_jump(u8 op2)
START_OF_INSTR();
switch (op2) {
case 0x80:
name = "JO\t";
name = (char *)"JO\t";
cond = ACCESS_FLAG(F_OF);
break;
case 0x81:
name = "JNO\t";
name = (char *)"JNO\t";
cond = !ACCESS_FLAG(F_OF);
break;
case 0x82:
name = "JB\t";
name = (char *)"JB\t";
cond = ACCESS_FLAG(F_CF);
break;
case 0x83:
name = "JNB\t";
name = (char *)"JNB\t";
cond = !ACCESS_FLAG(F_CF);
break;
case 0x84:
name = "JZ\t";
name = (char *)"JZ\t";
cond = ACCESS_FLAG(F_ZF);
break;
case 0x85:
name = "JNZ\t";
name = (char *)"JNZ\t";
cond = !ACCESS_FLAG(F_ZF);
break;
case 0x86:
name = "JBE\t";
name = (char *)"JBE\t";
cond = ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF);
break;
case 0x87:
name = "JNBE\t";
name = (char *)"JNBE\t";
cond = !(ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF));
break;
case 0x88:
name = "JS\t";
name = (char *)"JS\t";
cond = ACCESS_FLAG(F_SF);
break;
case 0x89:
name = "JNS\t";
name = (char *)"JNS\t";
cond = !ACCESS_FLAG(F_SF);
break;
case 0x8a:
name = "JP\t";
name = (char *)"JP\t";
cond = ACCESS_FLAG(F_PF);
break;
case 0x8b:
name = "JNP\t";
name = (char *)"JNP\t";
cond = !ACCESS_FLAG(F_PF);
break;
case 0x8c:
name = "JL\t";
name = (char *)"JL\t";
cond = xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF));
break;
case 0x8d:
name = "JNL\t";
name = (char *)"JNL\t";
cond = xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF));
break;
case 0x8e:
name = "JLE\t";
name = (char *)"JLE\t";
cond = (xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
ACCESS_FLAG(F_ZF));
break;
case 0x8f:
name = "JNLE\t";
name = (char *)"JNLE\t";
cond = !(xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
ACCESS_FLAG(F_ZF));
break;
Expand Down Expand Up @@ -180,68 +180,68 @@ void x86emuOp2_set_byte(u8 op2)
START_OF_INSTR();
switch (op2) {
case 0x90:
name = "SETO\t";
name = (char *)"SETO\t";
cond = ACCESS_FLAG(F_OF);
break;
case 0x91:
name = "SETNO\t";
name = (char *)"SETNO\t";
cond = !ACCESS_FLAG(F_OF);
break;
case 0x92:
name = "SETB\t";
name = (char *)"SETB\t";
cond = ACCESS_FLAG(F_CF);
break;
case 0x93:
name = "SETNB\t";
name = (char *)"SETNB\t";
cond = !ACCESS_FLAG(F_CF);
break;
case 0x94:
name = "SETZ\t";
name = (char *)"SETZ\t";
cond = ACCESS_FLAG(F_ZF);
break;
case 0x95:
name = "SETNZ\t";
name = (char *)"SETNZ\t";
cond = !ACCESS_FLAG(F_ZF);
break;
case 0x96:
name = "SETBE\t";
name = (char *)"SETBE\t";
cond = ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF);
break;
case 0x97:
name = "SETNBE\t";
name = (char *)"SETNBE\t";
cond = !(ACCESS_FLAG(F_CF) || ACCESS_FLAG(F_ZF));
break;
case 0x98:
name = "SETS\t";
name = (char *)"SETS\t";
cond = ACCESS_FLAG(F_SF);
break;
case 0x99:
name = "SETNS\t";
name = (char *)"SETNS\t";
cond = !ACCESS_FLAG(F_SF);
break;
case 0x9a:
name = "SETP\t";
name = (char *)"SETP\t";
cond = ACCESS_FLAG(F_PF);
break;
case 0x9b:
name = "SETNP\t";
name = (char *)"SETNP\t";
cond = !ACCESS_FLAG(F_PF);
break;
case 0x9c:
name = "SETL\t";
name = (char *)"SETL\t";
cond = xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF));
break;
case 0x9d:
name = "SETNL\t";
name = (char *)"SETNL\t";
cond = xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF));
break;
case 0x9e:
name = "SETLE\t";
name = (char *)"SETLE\t";
cond = (xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
ACCESS_FLAG(F_ZF));
break;
case 0x9f:
name = "SETNLE\t";
name = (char *)"SETNLE\t";
cond = !(xorl(ACCESS_FLAG(F_SF), ACCESS_FLAG(F_OF)) ||
ACCESS_FLAG(F_ZF));
break;
Expand Down