From 506627959d0e281deea1774314d84bb8b242a638 Mon Sep 17 00:00:00 2001 From: Nick Downing Date: Wed, 25 Jan 2017 23:41:24 +1100 Subject: [PATCH] Post-ansification changes for bin/adb --- bin/adb/instrs | 259 --------------------------------------------- bin/adb/optab.c | 133 +++++++++++------------ bin/adb/output.c | 12 ++- bin/adb/print.c | 54 +++++----- bin/adb/runpcs.c | 4 +- bin/as/assizetab.c | 8 +- bin/as/instrs.h | 2 +- 7 files changed, 107 insertions(+), 365 deletions(-) delete mode 100644 bin/adb/instrs diff --git a/bin/adb/instrs b/bin/adb/instrs deleted file mode 100644 index 95fdaee..0000000 --- a/bin/adb/instrs +++ /dev/null @@ -1,259 +0,0 @@ -/* Copyright(c) 1980 Regents of the University of California */ -/* "@(#)instrs 4.1 8/16/80" */ -OP("acbb",0x9d,4,ACCR+TYPB,ACCR+TYPB,ACCM+TYPB,ACCB+TYPW,0,0), -OP("acbd",0x6f,4,ACCR+TYPD,ACCR+TYPD,ACCM+TYPD,ACCB+TYPW,0,0), -OP("acbf",0x4f,4,ACCR+TYPF,ACCR+TYPF,ACCM+TYPF,ACCB+TYPW,0,0), -OP("acbl",0xf1,4,ACCR+TYPL,ACCR+TYPL,ACCM+TYPL,ACCB+TYPW,0,0), -OP("acbw",0x3d,4,ACCR+TYPW,ACCR+TYPW,ACCM+TYPW,ACCB+TYPW,0,0), -OP("adawi",0x58,2,ACCR+TYPW,ACCM+TYPW,0,0,0,0), -OP("addb2",0x80,2,ACCR+TYPB,ACCM+TYPB,0,0,0,0), -OP("addb3",0x81,3,ACCR+TYPB,ACCR+TYPB,ACCW+TYPB,0,0,0), -OP("addd2",0x60,2,ACCR+TYPD,ACCM+TYPD,0,0,0,0), -OP("addd3",0x61,3,ACCR+TYPD,ACCR+TYPD,ACCW+TYPD,0,0,0), -OP("addf2",0x40,2,ACCR+TYPF,ACCM+TYPF,0,0,0,0), -OP("addf3",0x41,3,ACCR+TYPF,ACCR+TYPF,ACCW+TYPF,0,0,0), -OP("addl2",0xc0,2,ACCR+TYPL,ACCM+TYPL,0,0,0,0), -OP("addl3",0xc1,3,ACCR+TYPL,ACCR+TYPL,ACCW+TYPL,0,0,0), -OP("addp4",0x20,4,ACCR+TYPW,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB,0,0), -OP("addp6",0x21,6,ACCR+TYPW,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB), -OP("addw2",0xa0,2,ACCR+TYPW,ACCM+TYPW,0,0,0,0), -OP("addw3",0xa1,3,ACCR+TYPW,ACCR+TYPW,ACCW+TYPW,0,0,0), -OP("adwc",0xd8,2,ACCR+TYPL,ACCM+TYPL,0,0,0,0), -OP("aobleq",0xf3,3,ACCR+TYPL,ACCM+TYPL,ACCB+TYPB,0,0,0), -OP("aoblss",0xf2,3,ACCR+TYPL,ACCM+TYPL,ACCB+TYPB,0,0,0), -OP("ashl",0x78,3,ACCR+TYPB,ACCR+TYPL,ACCW+TYPL,0,0,0), -OP("ashp",0xf8,6,ACCR+TYPB,ACCR+TYPW,ACCA+TYPB,ACCR+TYPB,ACCR+TYPW,ACCA+TYPB), -OP("ashq",0x79,3,ACCR+TYPB,ACCR+TYPQ,ACCW+TYPQ,0,0,0), -OP("bbc",0xe1,3,ACCR+TYPL,ACCR+TYPB,ACCB+TYPB,0,0,0), -OP("bbcc",0xe5,3,ACCR+TYPL,ACCR+TYPB,ACCB+TYPB,0,0,0), -OP("bbcci",0xe7,3,ACCR+TYPL,ACCR+TYPB,ACCB+TYPB,0,0,0), -OP("bbcs",0xe3,3,ACCR+TYPL,ACCR+TYPB,ACCB+TYPB,0,0,0), -OP("bbs",0xe0,3,ACCR+TYPL,ACCR+TYPB,ACCB+TYPB,0,0,0), -OP("bbsc",0xe4,3,ACCR+TYPL,ACCR+TYPB,ACCB+TYPB,0,0,0), -OP("bbss",0xe2,3,ACCR+TYPL,ACCR+TYPB,ACCB+TYPB,0,0,0), -OP("bbssi",0xe6,3,ACCR+TYPL,ACCR+TYPB,ACCB+TYPB,0,0,0), -OP("bcc",0x1e,1,ACCB+TYPB,0,0,0,0,0), -OP("bcs",0x1f,1,ACCB+TYPB,0,0,0,0,0), -OP("beql",0x13,1,ACCB+TYPB,0,0,0,0,0), -OP("beqlu",0x13,1,ACCB+TYPB,0,0,0,0,0), -OP("bgeq",0x18,1,ACCB+TYPB,0,0,0,0,0), -OP("bgequ",0x1e,1,ACCB+TYPB,0,0,0,0,0), -OP("bgtr",0x14,1,ACCB+TYPB,0,0,0,0,0), -OP("bgtru",0x1a,1,ACCB+TYPB,0,0,0,0,0), -OP("bicb2",0x8a,2,ACCR+TYPB,ACCM+TYPB,0,0,0,0), -OP("bicb3",0x8b,3,ACCR+TYPB,ACCR+TYPB,ACCW+TYPB,0,0,0), -OP("bicl2",0xca,2,ACCR+TYPL,ACCM+TYPL,0,0,0,0), -OP("bicl3",0xcb,3,ACCR+TYPL,ACCR+TYPL,ACCW+TYPL,0,0,0), -OP("bicpsw",0xb9,1,ACCR+TYPW,0,0,0,0,0), -OP("bicw2",0xaa,2,ACCR+TYPW,ACCM+TYPW,0,0,0,0), -OP("bicw3",0xab,3,ACCR+TYPW,ACCR+TYPW,ACCW+TYPW,0,0,0), -OP("bisb2",0x88,2,ACCR+TYPB,ACCM+TYPB,0,0,0,0), -OP("bisb3",0x89,3,ACCR+TYPB,ACCR+TYPB,ACCW+TYPB,0,0,0), -OP("bisl2",0xc8,2,ACCR+TYPL,ACCM+TYPL,0,0,0,0), -OP("bisl3",0xc9,3,ACCR+TYPL,ACCR+TYPL,ACCW+TYPL,0,0,0), -OP("bispsw",0xb8,1,ACCR+TYPW,0,0,0,0,0), -OP("bisw2",0xa8,2,ACCR+TYPW,ACCM+TYPW,0,0,0,0), -OP("bisw3",0xa9,3,ACCR+TYPW,ACCR+TYPW,ACCW+TYPW,0,0,0), -OP("bitb",0x93,2,ACCR+TYPB,ACCR+TYPB,0,0,0,0), -OP("bitl",0xd3,2,ACCR+TYPL,ACCR+TYPL,0,0,0,0), -OP("bitw",0xb3,2,ACCR+TYPW,ACCR+TYPW,0,0,0,0), -OP("blbs",0xe8,2,ACCR+TYPL,ACCB+TYPB,0,0,0,0), -OP("blbc",0xe9,2,ACCR+TYPL,ACCB+TYPB,0,0,0,0), -OP("bleq",0x15,1,ACCB+TYPB,0,0,0,0,0), -OP("blequ",0x1b,1,ACCB+TYPB,0,0,0,0,0), -OP("blss",0x19,1,ACCB+TYPB,0,0,0,0,0), -OP("blssu",0x1f,1,ACCB+TYPB,0,0,0,0,0), -OP("bneq",0x12,1,ACCB+TYPB,0,0,0,0,0), -OP("bnequ",0x12,1,ACCB+TYPB,0,0,0,0,0), -OP("bpt",0x03,0,0,0,0,0,0,0), -OP("brb",0x11,1,ACCB+TYPB,0,0,0,0,0), -OP("brw",0x31,1,ACCB+TYPW,0,0,0,0,0), -OP("bsbb",0x10,1,ACCB+TYPB,0,0,0,0,0), -OP("bsbw",0x30,1,ACCB+TYPW,0,0,0,0,0), -OP("bvc",0x1c,1,ACCB+TYPB,0,0,0,0,0), -OP("bvs",0x1d,1,ACCB+TYPB,0,0,0,0,0), -OP("callg",0xfa,2,ACCA+TYPB,ACCA+TYPB,0,0,0,0), -OP("calls",0xfb,2,ACCR+TYPL,ACCA+TYPB,0,0,0,0), -OP("caseb",0x8f,3,ACCR+TYPB,ACCR+TYPB,ACCR+TYPB,0,0,0), -OP("casel",0xcf,3,ACCR+TYPL,ACCR+TYPL,ACCR+TYPL,0,0,0), -OP("casew",0xaf,3,ACCR+TYPW,ACCR+TYPW,ACCR+TYPW,0,0,0), -OP("chme",0xbd,1,ACCR+TYPW,0,0,0,0,0), -OP("chmk",0xbc,1,ACCR+TYPW,0,0,0,0,0), -OP("chms",0xbe,1,ACCR+TYPW,0,0,0,0,0), -OP("chmu",0xbf,1,ACCR+TYPW,0,0,0,0,0), -OP("clrb",0x94,1,ACCW+TYPB,0,0,0,0,0), -OP("clrd",0x7c,1,ACCW+TYPD,0,0,0,0,0), -OP("clrf",0xd4,1,ACCW+TYPF,0,0,0,0,0), -OP("clrl",0xd4,1,ACCW+TYPL,0,0,0,0,0), -OP("clrq",0x7c,1,ACCW+TYPQ,0,0,0,0,0), -OP("clrw",0xb4,1,ACCW+TYPW,0,0,0,0,0), -OP("cmpb",0x91,2,ACCR+TYPB,ACCR+TYPB,0,0,0,0), -OP("cmpc3",0x29,3,ACCR+TYPW,ACCA+TYPB,ACCA+TYPB,0,0,0), -OP("cmpc5",0x2d,5,ACCR+TYPW,ACCA+TYPB,ACCR+TYPB,ACCR+TYPW,ACCA+TYPB,0), -OP("cmpd",0x71,2,ACCR+TYPD,ACCR+TYPD,0,0,0,0), -OP("cmpf",0x51,2,ACCR+TYPF,ACCR+TYPF,0,0,0,0), -OP("cmpl",0xd1,2,ACCR+TYPL,ACCR+TYPL,0,0,0,0), -OP("cmpp3",0x35,3,ACCR+TYPW,ACCA+TYPB,ACCA+TYPB,0,0,0), -OP("cmpp4",0x37,4,ACCR+TYPW,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB,0,0), -OP("cmpv",0xec,4,ACCR+TYPL,ACCR+TYPB,ACCR+TYPB,ACCR+TYPL,0,0), -OP("cmpw",0xb1,2,ACCR+TYPW,ACCR+TYPW,0,0,0,0), -OP("cmpzv",0xed,4,ACCR+TYPL,ACCR+TYPB,ACCR+TYPB,ACCR+TYPL,0,0), -OP("crc",0x0b,4,ACCA+TYPB,ACCR+TYPL,ACCR+TYPW,ACCA+TYPB,0,0), -OP("cvtbd",0x6c,2,ACCR+TYPB,ACCW+TYPD,0,0,0,0), -OP("cvtbf",0x4c,2,ACCR+TYPB,ACCW+TYPB,0,0,0,0), -OP("cvtbl",0x98,2,ACCR+TYPB,ACCW+TYPL,0,0,0,0), -OP("cvtbw",0x99,2,ACCR+TYPB,ACCW+TYPW,0,0,0,0), -OP("cvtdb",0x68,2,ACCR+TYPD,ACCW+TYPB,0,0,0,0), -OP("cvtdf",0x76,2,ACCR+TYPD,ACCW+TYPF,0,0,0,0), -OP("cvtdl",0x6a,2,ACCR+TYPD,ACCW+TYPL,0,0,0,0), -OP("cvtdw",0x69,2,ACCR+TYPD,ACCW+TYPW,0,0,0,0), -OP("cvtfb",0x48,2,ACCR+TYPF,ACCW+TYPB,0,0,0,0), -OP("cvtfd",0x56,2,ACCR+TYPF,ACCW+TYPD,0,0,0,0), -OP("cvtfl",0x4a,2,ACCR+TYPF,ACCW+TYPL,0,0,0,0), -OP("cvtfw",0x49,2,ACCR+TYPF,ACCW+TYPW,0,0,0,0), -OP("cvtlb",0xf6,2,ACCR+TYPL,ACCW+TYPB,0,0,0,0), -OP("cvtld",0x6e,2,ACCR+TYPL,ACCW+TYPD,0,0,0,0), -OP("cvtlf",0x4e,2,ACCR+TYPL,ACCW+TYPF,0,0,0,0), -OP("cvtlp",0xf9,3,ACCR+TYPL,ACCR+TYPW,ACCA+TYPB,0,0,0), -OP("cvtlw",0xf7,2,ACCR+TYPL,ACCW+TYPW,0,0,0,0), -OP("cvtpl",0x36,3,ACCR+TYPW,ACCA+TYPB,ACCW+TYPL,0,0,0), -OP("cvttp",0x26,5,ACCR+TYPW,ACCA+TYPB,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB,0), -OP("cvtpt",0x24,5,ACCR+TYPW,ACCA+TYPB,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB,0), -OP("cvtps",0x08,4,ACCR+TYPW,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB,0,0), -OP("cvtrdl",0x6b,2,ACCR+TYPD,ACCW+TYPL,0,0,0,0), -OP("cvtrfl",0x4b,2,ACCR+TYPF,ACCW+TYPL,0,0,0,0), -OP("cvtsp",0x09,4,ACCR+TYPW,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB,0,0), -OP("cvtwb",0x33,2,ACCR+TYPW,ACCW+TYPB,0,0,0,0), -OP("cvtwd",0x6d,2,ACCR+TYPW,ACCW+TYPD,0,0,0,0), -OP("cvtwf",0x4d,2,ACCR+TYPW,ACCW+TYPF,0,0,0,0), -OP("cvtwl",0x32,2,ACCR+TYPW,ACCW+TYPL,0,0,0,0), -OP("decb",0x97,1,ACCM+TYPB,0,0,0,0,0), -OP("decl",0xd7,1,ACCM+TYPL,0,0,0,0,0), -OP("decw",0xb7,1,ACCM+TYPW,0,0,0,0,0), -OP("divb2",0x86,2,ACCR+TYPB,ACCM+TYPB,0,0,0,0), -OP("divb3",0x87,3,ACCR+TYPB,ACCR+TYPB,ACCW+TYPB,0,0,0), -OP("divd2",0x66,2,ACCR+TYPD,ACCM+TYPD,0,0,0,0), -OP("divd3",0x67,3,ACCR+TYPD,ACCR+TYPD,ACCR+TYPD,0,0,0), -OP("divf2",0x46,2,ACCR+TYPF,ACCM+TYPF,0,0,0,0), -OP("divf3",0x47,3,ACCR+TYPF,ACCR+TYPF,ACCW+TYPF,0,0,0), -OP("divl2",0xc6,2,ACCR+TYPL,ACCM+TYPL,0,0,0,0), -OP("divl3",0xc7,3,ACCR+TYPL,ACCR+TYPL,ACCW+TYPL,0,0,0), -OP("divp",0x27,6,ACCR+TYPW,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB), -OP("divw2",0xa6,2,ACCR+TYPW,ACCM+TYPW,0,0,0,0), -OP("divw3",0xa7,3,ACCR+TYPW,ACCR+TYPW,ACCW+TYPW,0,0,0), -OP("editpc",0x38,4,ACCR+TYPW,ACCA+TYPB,ACCA+TYPB,ACCA+TYPB,0,0), -OP("ediv",0x7b,4,ACCR+TYPL,ACCR+TYPQ,ACCW+TYPL,ACCW+TYPL,0,0), -OP("emodd",0x74,5,ACCR+TYPD,ACCR+TYPB,ACCR+TYPD,ACCW+TYPL,ACCW+TYPD,0), -OP("emodf",0x54,5,ACCR+TYPF,ACCR+TYPB,ACCR+TYPF,ACCW+TYPL,ACCW+TYPF,0), -OP("emul",0x7a,4,ACCR+TYPL,ACCR+TYPL,ACCR+TYPL,ACCW+TYPQ,0,0), -OP("extv",0xee,4,ACCR+TYPL,ACCR+TYPB,ACCR+TYPB,ACCW+TYPL,0,0), -OP("extzv",0xef,4,ACCR+TYPL,ACCR+TYPB,ACCR+TYPB,ACCW+TYPL,0,0), -OP("ffc",0xeb,4,ACCR+TYPL,ACCR+TYPB,ACCR+TYPB,ACCW+TYPL,0,0), -OP("ffs",0xea,4,ACCR+TYPL,ACCR+TYPB,ACCR+TYPB,ACCW+TYPL,0,0), -OP("halt",0x00,0,0,0,0,0,0,0), -OP("incb",0x96,1,ACCM+TYPB,0,0,0,0,0), -OP("incl",0xd6,1,ACCM+TYPL,0,0,0,0,0), -OP("incw",0xb6,1,ACCM+TYPW,0,0,0,0,0), -OP("index",0x0a,6,ACCR+TYPL,ACCR+TYPL,ACCR+TYPL,ACCR+TYPL,ACCR+TYPL,ACCW+TYPL), -OP("insque",0x0e,2,ACCA+TYPB,ACCA+TYPB,0,0,0,0), -OP("insv",0xf0,4,ACCR+TYPL,ACCR+TYPL,ACCR+TYPB,ACCW+TYPB,0,0), -OP("jmp",0x17,1,ACCA+TYPB,0,0,0,0,0), -OP("jsb",0x16,1,ACCA+TYPB,0,0,0,0,0), -OP("ldpctx",0x06,0,0,0,0,0,0,0), -OP("locc",0x3a,3,ACCR+TYPB,ACCR+TYPW,ACCA+TYPB,0,0,0), -OP("matchc",0x39,4,ACCR+TYPW,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB,0,0), -OP("mcomb",0x92,2,ACCR+TYPB,ACCW+TYPB,0,0,0,0), -OP("mcoml",0xd2,2,ACCR+TYPL,ACCW+TYPL,0,0,0,0), -OP("mcomw",0xb2,2,ACCR+TYPW,ACCW+TYPW,0,0,0,0), -OP("mfpr",0xdb,2,ACCR+TYPL,ACCW+TYPL,0,0,0,0), -OP("mnegb",0x8e,2,ACCR+TYPB,ACCW+TYPB,0,0,0,0), -OP("mnegd",0x72,2,ACCR+TYPD,ACCW+TYPD,0,0,0,0), -OP("mnegf",0x52,2,ACCR+TYPF,ACCW+TYPF,0,0,0,0), -OP("mnegl",0xce,2,ACCR+TYPL,ACCW+TYPL,0,0,0,0), -OP("mnegw",0xae,2,ACCR+TYPW,ACCW+TYPL,0,0,0,0), -OP("movab",0x9e,2,ACCA+TYPB,ACCW+TYPL,0,0,0,0), -OP("movad",0x7e,2,ACCA+TYPD,ACCW+TYPL,0,0,0,0), -OP("movaf",0xde,2,ACCA+TYPF,ACCW+TYPL,0,0,0,0), -OP("moval",0xde,2,ACCA+TYPL,ACCW+TYPL,0,0,0,0), -OP("movaq",0x7e,2,ACCA+TYPQ,ACCW+TYPL,0,0,0,0), -OP("movaw",0x3e,2,ACCA+TYPW,ACCW+TYPL,0,0,0,0), -OP("movb",0x90,2,ACCR+TYPB,ACCW+TYPB,0,0,0,0), -OP("movc3",0x28,3,ACCR+TYPW,ACCA+TYPB,ACCA+TYPB,0,0,0), -OP("movc5",0x2c,5,ACCR+TYPW,ACCA+TYPB,ACCR+TYPB,ACCR+TYPW,ACCA+TYPB,0), -OP("movd",0x70,2,ACCR+TYPD,ACCW+TYPD,0,0,0,0), -OP("movf",0x50,2,ACCR+TYPF,ACCW+TYPF,0,0,0,0), -OP("movl",0xd0,2,ACCR+TYPL,ACCW+TYPL,0,0,0,0), -OP("movp",0x34,3,ACCR+TYPW,ACCA+TYPB,ACCA+TYPB,0,0,0), -OP("movpsl",0xdc,1,ACCW+TYPL,0,0,0,0,0), -OP("movq",0x7d,2,ACCR+TYPQ,ACCW+TYPQ,0,0,0,0), -OP("movtc",0x2e,6,ACCR+TYPW,ACCA+TYPB,ACCR+TYPB,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB), -OP("movtuc",0x2f,6,ACCR+TYPW,ACCA+TYPB,ACCR+TYPB,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB), -OP("movw",0xb0,2,ACCR+TYPW,ACCW+TYPW,0,0,0,0), -OP("movzbl",0x9a,2,ACCR+TYPB,ACCW+TYPL,0,0,0,0), -OP("movzbw",0x9b,2,ACCR+TYPB,ACCW+TYPW,0,0,0,0), -OP("movzwl",0x3c,2,ACCR+TYPW,ACCW+TYPL,0,0,0,0), -OP("mtpr",0xda,2,ACCR+TYPL,ACCR+TYPL,0,0,0,0), -OP("mulb2",0x84,2,ACCR+TYPB,ACCM+TYPB,0,0,0,0), -OP("mulb3",0x85,3,ACCR+TYPB,ACCR+TYPB,ACCW+TYPB,0,0,0), -OP("muld2",0x64,2,ACCR+TYPD,ACCM+TYPD,0,0,0,0), -OP("muld3",0x65,3,ACCR+TYPD,ACCR+TYPD,ACCW+TYPD,0,0,0), -OP("mulf2",0x44,2,ACCR+TYPF,ACCM+TYPF,0,0,0,0), -OP("mulf3",0x45,3,ACCR+TYPF,ACCR+TYPF,ACCW+TYPF,0,0,0), -OP("mull2",0xc4,2,ACCR+TYPL,ACCM+TYPL,0,0,0,0), -OP("mull3",0xc5,3,ACCR+TYPL,ACCR+TYPL,ACCW+TYPL,0,0,0), -OP("mulp",0x25,6,ACCR+TYPW,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB), -OP("mulw2",0xa4,2,ACCR+TYPW,ACCM+TYPW,0,0,0,0), -OP("mulw3",0xa5,3,ACCR+TYPW,ACCR+TYPW,ACCW+TYPW,0,0,0), -OP("nop",0x01,0,0,0,0,0,0,0), -OP("polyd",0x75,3,ACCR+TYPD,ACCR+TYPW,ACCA+TYPB,0,0,0), -OP("polyf",0x55,3,ACCR+TYPF,ACCR+TYPW,ACCA+TYPB,0,0,0), -OP("popr",0xba,1,ACCR+TYPW,0,0,0,0,0), -OP("prober",0x0c,3,ACCR+TYPB,ACCR+TYPW,ACCA+TYPB,0,0,0), -OP("probew",0x0d,3,ACCR+TYPB,ACCR+TYPW,ACCA+TYPB,0,0,0), -OP("pushab",0x9f,1,ACCA+TYPB,0,0,0,0,0), -OP("pushad",0x7f,1,ACCA+TYPD,0,0,0,0,0), -OP("pushaf",0xdf,1,ACCA+TYPF,0,0,0,0,0), -OP("pushal",0xdf,1,ACCA+TYPL,0,0,0,0,0), -OP("pushaq",0x7f,1,ACCA+TYPQ,0,0,0,0,0), -OP("pushaw",0x3f,1,ACCA+TYPW,0,0,0,0,0), -OP("pushl",0xdd,1,ACCR+TYPL,0,0,0,0,0), -OP("pushr",0xbb,1,ACCR+TYPW,0,0,0,0,0), -OP("rei",0x02,0,0,0,0,0,0,0), -OP("remque",0x0f,2,ACCA+TYPB,ACCW+TYPL,0,0,0,0), -OP("ret",0x04,0,0,0,0,0,0,0), -OP("rotl",0x9c,3,ACCR+TYPB,ACCR+TYPL,ACCW+TYPL,0,0,0), -OP("rsb",0x05,0,0,0,0,0,0,0), -OP("sbwc",0xd9,2,ACCR+TYPL,ACCM+TYPL,0,0,0,0), -OP("scanc",0x2a,4,ACCR+TYPW,ACCA+TYPB,ACCA+TYPB,ACCR+TYPB,0,0), -OP("skpc",0x3b,3,ACCR+TYPB,ACCR+TYPW,ACCA+TYPB,0,0,0), -OP("sobgeq",0xf4,2,ACCM+TYPL,ACCB+TYPB,0,0,0,0), -OP("sobgtr",0xf5,2,ACCM+TYPL,ACCB+TYPB,0,0,0,0), -OP("spanc",0x2b,4,ACCR+TYPW,ACCA+TYPB,ACCA+TYPB,ACCR+TYPB,0,0), -OP("subb2",0x82,2,ACCR+TYPB,ACCM+TYPB,0,0,0,0), -OP("subb3",0x83,3,ACCR+TYPB,ACCR+TYPB,ACCW+TYPB,0,0,0), -OP("subd2",0x62,2,ACCR+TYPD,ACCM+TYPD,0,0,0,0), -OP("subd3",0x63,3,ACCR+TYPD,ACCR+TYPD,ACCW+TYPD,0,0,0), -OP("subf2",0x42,2,ACCR+TYPF,ACCM+TYPF,0,0,0,0), -OP("subf3",0x43,3,ACCR+TYPF,ACCR+TYPF,ACCW+TYPF,0,0,0), -OP("subl2",0xc2,2,ACCR+TYPL,ACCM+TYPL,0,0,0,0), -OP("subl3",0xc3,3,ACCR+TYPL,ACCR+TYPL,ACCW+TYPL,0,0,0), -OP("subp4",0x22,4,ACCR+TYPW,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB,0,0), -OP("subp6",0x23,6,ACCR+TYPW,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB,ACCR+TYPW,ACCA+TYPB), -OP("subw2",0xa2,2,ACCR+TYPW,ACCM+TYPW,0,0,0,0), -OP("subw3",0xa3,3,ACCR+TYPW,ACCR+TYPW,ACCW+TYPW,0,0,0), -OP("svpctx",0x07,0,0,0,0,0,0,0), -OP("tstb",0x95,1,ACCR+TYPB,0,0,0,0,0), -OP("tstd",0x73,1,ACCR+TYPD,0,0,0,0,0), -OP("tstf",0x53,1,ACCR+TYPF,0,0,0,0,0), -OP("tstl",0xd5,1,ACCR+TYPL,0,0,0,0,0), -OP("tstw",0xb5,1,ACCR+TYPW,0,0,0,0,0), -OP("xfc",0xfc,1,ACCI+TYPB,0,0,0,0,0), -OP("xorb2",0x8c,2,ACCR+TYPB,ACCM+TYPB,0,0,0,0), -OP("xorb3",0x8d,3,ACCR+TYPB,ACCR+TYPB,ACCW+TYPB,0,0,0), -OP("xorl2",0xcc,2,ACCR+TYPL,ACCM+TYPL,0,0,0,0), -OP("xorl3",0xcd,3,ACCR+TYPL,ACCR+TYPL,ACCW+TYPL,0,0,0), -OP("xorw2",0xac,2,ACCR+TYPW,ACCM+TYPW,0,0,0,0), -OP("xorw3",0xad,3,ACCR+TYPW,ACCR+TYPW,ACCW+TYPW,0,0,0), -OP("escd",0xfd,0,0,0,0,0,0,0), -OP("esce",0xfe,0,0,0,0,0,0,0), -OP("escf",0xff,0,0,0,0,0,0,0), diff --git a/bin/adb/optab.c b/bin/adb/optab.c index 8d75f5b..41c38c5 100644 --- a/bin/adb/optab.c +++ b/bin/adb/optab.c @@ -2,7 +2,7 @@ #include "defs.h" #include "mode.h" -#ifndef lint +#if defined(DOSCCS) && !defined(lint) static char optab_sccsid[] = "@(#)optab.c 4.3 10/27/82"; #endif #ifdef ADB @@ -18,7 +18,8 @@ static char optab_sccsid[] = "@(#)optab.c 4.3 10/27/82"; struct insttab insttab[] = { #include "instrs.adb" -0}; +{0,0,0,0,{0,0,0,0,0,0}} +}; #include "../as/assizetab.c" #undef ADB @@ -26,70 +27,70 @@ struct systab { int argc; char *sname; } systab[] = { - 1, "indir", - 0, "exit", - 0, "fork", - 2, "read", - 2, "write", - 2, "open", - 0, "close", - 0, "wait", - 2, "creat", - 2, "link", - 1, "unlink", - 2, "exec", - 1, "chdir", - 0, "time", - 3, "mknod", - 2, "chmod", - 2, "chown", - 1, "break", - 2, "stat", - 2, "seek", - 0, "getpid", - 3, "mount", - 1, "umount", - 0, "setuid", - 0, "getuid", - 0, "stime", - 3, "ptrace", - 0, "alarm", - 1, "fstat", - 0, "pause", - 1, "30", - 1, "stty", - 1, "gtty", - 0, "access", - 0, "nice", - 0, "sleep", - 0, "sync", - 1, "kill", - 0, "csw", - 0, "setpgrp", - 0, "tell", - 0, "dup", - 0, "pipe", - 1, "times", - 4, "profil", - 0, "tiu", - 0, "setgid", - 0, "getgid", - 2, "signal", - 0, "49", - 0, "50", - 0, "51", - 0, "52", - 0, "53", - 0, "54", - 0, "55", - 0, "56", - 0, "57", - 0, "58", - 0, "59", - 0, "60", - 0, "61", - 0, "62", - 0, "63", + {1, "indir"}, + {0, "exit"}, + {0, "fork"}, + {2, "read"}, + {2, "write"}, + {2, "open"}, + {0, "close"}, + {0, "wait"}, + {2, "creat"}, + {2, "link"}, + {1, "unlink"}, + {2, "exec"}, + {1, "chdir"}, + {0, "time"}, + {3, "mknod"}, + {2, "chmod"}, + {2, "chown"}, + {1, "break"}, + {2, "stat"}, + {2, "seek"}, + {0, "getpid"}, + {3, "mount"}, + {1, "umount"}, + {0, "setuid"}, + {0, "getuid"}, + {0, "stime"}, + {3, "ptrace"}, + {0, "alarm"}, + {1, "fstat"}, + {0, "pause"}, + {1, "30"}, + {1, "stty"}, + {1, "gtty"}, + {0, "access"}, + {0, "nice"}, + {0, "sleep"}, + {0, "sync"}, + {1, "kill"}, + {0, "csw"}, + {0, "setpgrp"}, + {0, "tell"}, + {0, "dup"}, + {0, "pipe"}, + {1, "times"}, + {4, "profil"}, + {0, "tiu"}, + {0, "setgid"}, + {0, "getgid"}, + {2, "signal"}, + {0, "49"}, + {0, "50"}, + {0, "51"}, + {0, "52"}, + {0, "53"}, + {0, "54"}, + {0, "55"}, + {0, "56"}, + {0, "57"}, + {0, "58"}, + {0, "59"}, + {0, "60"}, + {0, "61"}, + {0, "62"}, + {0, "63"} }; char *regname[] = { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", diff --git a/bin/adb/output.c b/bin/adb/output.c index 54bc214..ec55a63 100644 --- a/bin/adb/output.c +++ b/bin/adb/output.c @@ -30,7 +30,7 @@ extern short infile; short outfile = 1; extern long maxpos; extern long maxoff; -extern short radix = 16; +short radix = 16; char printbuf[MAXLIN]; char *printptr = printbuf; @@ -38,7 +38,6 @@ char *digitptr; extern char TOODEEP[]; int eqstr(s1, s2) register char *s1; register char *s2; { - register char *es1; while (*s1++ == *s2) { if (*s2++ == 0) { return(1); @@ -117,8 +116,10 @@ void _printf(fmat, va_alist) char *fmat; va_dcl va_list argp; short width, prec; char c, adj; - short x, decpt, n; - long lx; +#ifndef vax + short decpt; +#endif + short n; char digits[64]; fptr = fmat; _va_start(argp, fmat); @@ -292,13 +293,14 @@ void printdbl(lx, ly, fmat, base) short lx, ly; char fmat; int base; void printdbl(lxy, fmat, base) long lxy; char fmat; int base; #endif { - int digs[20]; int *dptr; char k; + int digs[20]; #ifndef MULD2 register char *cp1; cp1=digs; if ((lxy&0xFFFF0000L)==0xFFFF0000L) {*cp1++='-'; lxy= -lxy;} sprintf(cp1,base==16 ? "%x" : "%D",lxy); cp1=digs; while (*digitptr++= *cp1++); --digitptr; #else + int *dptr; char k; double f ,g; long q; #ifdef vax short lx,ly; diff --git a/bin/adb/print.c b/bin/adb/print.c index 9597f6c..2ef2342 100644 --- a/bin/adb/print.c +++ b/bin/adb/print.c @@ -46,30 +46,30 @@ extern long localval; extern struct bkpt *bkpthead; struct reglist reglist [] = { - "p1lr", _P1LR, &pcb.pcb_p1lr, - "p1br", _P1BR, &pcb.pcb_p1br, - "p0lr", _P0LR, &pcb.pcb_p0lr, - "p0br", _P0BR, &pcb.pcb_p0br, - "ksp", _KSP, &pcb.pcb_ksp, - "esp", _ESP, &pcb.pcb_esp, - "ssp", _SSP, &pcb.pcb_ssp, - "psl", _PSL, &pcb.pcb_psl, - "pc", _PC, &pcb.pcb_pc, - "usp", _USP, &pcb.pcb_usp, - "fp", _FP, &pcb.pcb_fp, - "ap", _AP, &pcb.pcb_ap, - "r11", _R11, &pcb.pcb_r11, - "r10", _R10, &pcb.pcb_r10, - "r9", _R9, &pcb.pcb_r9, - "r8", _R8, &pcb.pcb_r8, - "r7", _R7, &pcb.pcb_r7, - "r6", _R6, &pcb.pcb_r6, - "r5", _R5, &pcb.pcb_r5, - "r4", _R4, &pcb.pcb_r4, - "r3", _R3, &pcb.pcb_r3, - "r2", _R2, &pcb.pcb_r2, - "r1", _R1, &pcb.pcb_r1, - "r0", _R0, &pcb.pcb_r0, + {"p1lr", _P1LR, &pcb.pcb_p1lr}, + {"p1br", _P1BR, &pcb.pcb_p1br}, + {"p0lr", _P0LR, &pcb.pcb_p0lr}, + {"p0br", _P0BR, &pcb.pcb_p0br}, + {"ksp", _KSP, &pcb.pcb_ksp}, + {"esp", _ESP, &pcb.pcb_esp}, + {"ssp", _SSP, &pcb.pcb_ssp}, + {"psl", _PSL, &pcb.pcb_psl}, + {"pc", _PC, &pcb.pcb_pc}, + {"usp", _USP, &pcb.pcb_usp}, + {"fp", _FP, &pcb.pcb_fp}, + {"ap", _AP, &pcb.pcb_ap}, + {"r11", _R11, &pcb.pcb_r11}, + {"r10", _R10, &pcb.pcb_r10}, + {"r9", _R9, &pcb.pcb_r9}, + {"r8", _R8, &pcb.pcb_r8}, + {"r7", _R7, &pcb.pcb_r7}, + {"r6", _R6, &pcb.pcb_r6}, + {"r5", _R5, &pcb.pcb_r5}, + {"r4", _R4, &pcb.pcb_r4}, + {"r3", _R3, &pcb.pcb_r3}, + {"r2", _R2, &pcb.pcb_r2}, + {"r1", _R1, &pcb.pcb_r1}, + {"r0", _R0, &pcb.pcb_r0} }; char lastc; @@ -127,13 +127,11 @@ char *signals[] = { /* general printing routines ($) */ void printtrace(modif) int modif; { - short narg, i, stat, name, limit; - unsigned dynam; + short narg, i; register struct bkpt *bkptr; - char hi, lo; intptr_t word; char *comptr; - intptr_t argp, frame, link; + intptr_t argp, frame; register struct nlist *sp; short stack; short ntramp; diff --git a/bin/adb/runpcs.c b/bin/adb/runpcs.c index 08e2234..2a34d45 100644 --- a/bin/adb/runpcs.c +++ b/bin/adb/runpcs.c @@ -287,8 +287,8 @@ void setbp() { } void bpwait() { - register intptr_t w; - intptr_t stat; + register int/*ptr_t*/ w; + int/*ptr_t*/ stat; signal(SIGINT, SIG_IGN); while ((w = wait(&stat))!=pid && w != -1); diff --git a/bin/as/assizetab.c b/bin/as/assizetab.c index efa8291..e953011 100644 --- a/bin/as/assizetab.c +++ b/bin/as/assizetab.c @@ -4,9 +4,9 @@ * specifies the terms and conditions for redistribution. */ -#ifndef lint +#if defined(DOSCCS) && !defined(lint) static char sccsid[] = "@(#)assizetab.c 5.1 (Berkeley) 4/30/85"; -#endif not lint +#endif #ifdef AS #include @@ -79,7 +79,7 @@ int type_124[] = { 0, 0, /* 14 */ TYPO, 0 /* 16 */ }; -#endif AS +#endif /* * Convert TYP[BWLQOFDGH] into {1 if relocation not OK} */ @@ -128,7 +128,7 @@ int ty_LEN[] = { LEN16, /* TYPH */ 0 /* TYPNONE */ }; -#endif AS +#endif /* * Convert TYP[BWLQOFDGH] into {1 ... 16} */ diff --git a/bin/as/instrs.h b/bin/as/instrs.h index 3b4d942..5aad0fe 100644 --- a/bin/as/instrs.h +++ b/bin/as/instrs.h @@ -138,7 +138,7 @@ extern struct insttab{ u_char argtype[6]; } insttab[]; -#define OP(name,eopcode,popdcode,nargs,a1,a2,a3,a4,a5,a6) {name,eopcode,popdcode,nargs,a1,a2,a3,a4,a5,a6} +#define OP(name,eopcode,popdcode,nargs,a1,a2,a3,a4,a5,a6) {name,eopcode,popdcode,nargs,{a1,a2,a3,a4,a5,a6}} #endif -- 2.34.1