--- uae/src/readcpu.c	2018/04/24 16:39:49	1.1.1.2
+++ uae/src/readcpu.c	2018/04/24 16:48:33	1.1.1.4
@@ -136,27 +136,27 @@ struct mnemolookup lookuptab[] = {
 
 struct instr *table68k;
 
-static __inline__ amodes mode_from_str(const char *str)
+STATIC_INLINE amodes mode_from_str (const char *str)
 {
-    if (strncmp(str,"Dreg",4) == 0) return Dreg;
-    if (strncmp(str,"Areg",4) == 0) return Areg;
-    if (strncmp(str,"Aind",4) == 0) return Aind;
-    if (strncmp(str,"Apdi",4) == 0) return Apdi;
-    if (strncmp(str,"Aipi",4) == 0) return Aipi;
-    if (strncmp(str,"Ad16",4) == 0) return Ad16;
-    if (strncmp(str,"Ad8r",4) == 0) return Ad8r;
-    if (strncmp(str,"absw",4) == 0) return absw;
-    if (strncmp(str,"absl",4) == 0) return absl;
-    if (strncmp(str,"PC16",4) == 0) return PC16;
-    if (strncmp(str,"PC8r",4) == 0) return PC8r;
-    if (strncmp(str,"Immd",4) == 0) return imm;
-    abort();
-    return(0);
+    if (strncmp (str, "Dreg", 4) == 0) return Dreg;
+    if (strncmp (str, "Areg", 4) == 0) return Areg;
+    if (strncmp (str, "Aind", 4) == 0) return Aind;
+    if (strncmp (str, "Apdi", 4) == 0) return Apdi;
+    if (strncmp (str, "Aipi", 4) == 0) return Aipi;
+    if (strncmp (str, "Ad16", 4) == 0) return Ad16;
+    if (strncmp (str, "Ad8r", 4) == 0) return Ad8r;
+    if (strncmp (str, "absw", 4) == 0) return absw;
+    if (strncmp (str, "absl", 4) == 0) return absl;
+    if (strncmp (str, "PC16", 4) == 0) return PC16;
+    if (strncmp (str, "PC8r", 4) == 0) return PC8r;
+    if (strncmp (str, "Immd", 4) == 0) return imm;
+    abort ();
+    return 0;
 }
 
-static __inline__ amodes mode_from_mr(int mode, int reg)
+STATIC_INLINE amodes mode_from_mr (int mode, int reg)
 {
-    switch(mode) {
+    switch (mode) {
      case 0: return Dreg;
      case 1: return Areg;
      case 2: return Aind;
@@ -165,7 +165,7 @@ static __inline__ amodes mode_from_mr(in
      case 5: return Ad16;
      case 6: return Ad8r;
      case 7:
-	switch(reg) {
+	switch (reg) {
 	 case 0: return absw;
 	 case 1: return absl;
 	 case 2: return PC16;
@@ -176,11 +176,11 @@ static __inline__ amodes mode_from_mr(in
 	 case 7: return am_illg;
 	}
     }
-    abort();
-    return(0);
+    abort ();
+    return 0;
 }
 
-static void build_insn(int insn)
+static void build_insn (int insn)
 {
     int find = -1;
     int variants;
@@ -192,8 +192,8 @@ static void build_insn(int insn)
 
     id = defs68k[insn];
 
-    for(i = 0; i < 5; i++) {
-	switch(id.flaginfo[i].flagset){
+    for (i = 0; i < 5; i++) {
+	switch (id.flaginfo[i].flagset){
 	 case fa_unset: break;
 	 case fa_isjmp: break;
 	 case fa_zero: flagdead |= 1 << i; break;
@@ -205,8 +205,8 @@ static void build_insn(int insn)
     }
 
     out1:
-    for(i = 0; i < 5; i++) {
-	switch(id.flaginfo[i].flaguse) {
+    for (i = 0; i < 5; i++) {
+	switch (id.flaginfo[i].flaguse) {
 	 case fu_unused: break;
 	 case fu_isjmp: flaglive |= 1 << i; break;
 	 case fu_maybecc: flaglive |= 1 << i; break;
@@ -238,12 +238,12 @@ static void build_insn(int insn)
 	amodes srcmode = am_unknown, destmode = am_unknown;
 	int srcreg = -1, destreg = -1;
 
-	for(i = 0; i < lastbit; i++)
+	for (i = 0; i < lastbit; i++)
 	    bitcnt[i] = bitval[i] = 0;
 
 	vmsk = 1 << id.n_variable;
 
-	for(i = 0, msk = 0x8000; i < 16; i++, msk >>= 1) {
+	for (i = 0, msk = 0x8000; i < 16; i++, msk >>= 1) {
 	    if (!(msk & id.mask)) {
 		int currbit = id.bitpos[bitno++];
 		int bit_set;
@@ -276,13 +276,13 @@ static void build_insn(int insn)
 	while (opcstr[pos] && !isspace(opcstr[pos])) {
 	    if (opcstr[pos] == '.') {
 		pos++;
-		switch(opcstr[pos]) {
+		switch (opcstr[pos]) {
 
 		 case 'B': sz = sz_byte; break;
 		 case 'W': sz = sz_word; break;
 		 case 'L': sz = sz_long; break;
 		 case 'z':
-		    switch(bitval[bitz]) {
+		    switch (bitval[bitz]) {
 		     case 0: sz = sz_byte; break;
 		     case 1: sz = sz_word; break;
 		     case 2: sz = sz_long; break;
@@ -293,9 +293,9 @@ static void build_insn(int insn)
 		}
 	    } else {
 		mnemonic[mnp] = opcstr[pos];
-		if(mnemonic[mnp] == 'f') {
+		if (mnemonic[mnp] == 'f') {
 		    find = -1;
-		    switch(bitval[bitf]) {
+		    switch (bitval[bitf]) {
 		     case 0: mnemonic[mnp] = 'R'; break;
 		     case 1: mnemonic[mnp] = 'L'; break;
 		     default: abort();
@@ -317,7 +317,7 @@ static void build_insn(int insn)
 
 	/* parse the source address */
 	usesrc = 1;
-	switch(opcstr[pos++]) {
+	switch (opcstr[pos++]) {
 	 case 'D':
 	    srcmode = Dreg;
 	    switch (opcstr[pos++]) {
@@ -340,7 +340,7 @@ static void build_insn(int insn)
 	    }
 	    break;
 	 case '#':
-	    switch(opcstr[pos++]) {
+	    switch (opcstr[pos++]) {
 	     case 'z': srcmode = imm; break;
 	     case '0': srcmode = imm0; break;
 	     case '1': srcmode = imm1; break;
@@ -390,7 +390,8 @@ static void build_insn(int insn)
 	 case 'd':
 	    srcreg = bitval[bitD];
 	    srcmode = mode_from_mr(bitval[bitd],bitval[bitD]);
-	    if (srcmode == am_illg) continue;
+	    if (srcmode == am_illg)
+		continue;
 	    if (CPU_EMU_SIZE < 2 &&
 		(srcmode == Areg || srcmode == Dreg || srcmode == Aind
 		 || srcmode == Ad16 || srcmode == Ad8r || srcmode == Aipi
@@ -439,7 +440,8 @@ static void build_insn(int insn)
 	    srcreg = bitval[bitS];
 	    srcmode = mode_from_mr(bitval[bits],bitval[bitS]);
 
-	    if (srcmode == am_illg) continue;
+	    if (srcmode == am_illg)
+		continue;
 	    if (CPU_EMU_SIZE < 2 &&
 		(srcmode == Areg || srcmode == Dreg || srcmode == Aind
 		 || srcmode == Ad16 || srcmode == Ad8r || srcmode == Aipi
@@ -498,7 +500,7 @@ static void build_insn(int insn)
 
 	/* parse the destination address */
 	usedst = 1;
-	switch(opcstr[pos++]) {
+	switch (opcstr[pos++]) {
 	 case 'D':
 	    destmode = Dreg;
 	    switch (opcstr[pos++]) {
@@ -520,7 +522,7 @@ static void build_insn(int insn)
 	    }
 	    break;
 	 case '#':
-	    switch(opcstr[pos++]) {
+	    switch (opcstr[pos++]) {
 	     case 'z': destmode = imm; break;
 	     case '0': destmode = imm0; break;
 	     case '1': destmode = imm1; break;
@@ -536,7 +538,8 @@ static void build_insn(int insn)
 	 case 'd':
 	    destreg = bitval[bitD];
 	    destmode = mode_from_mr(bitval[bitd],bitval[bitD]);
-	    if(destmode == am_illg) continue;
+	    if (destmode == am_illg)
+		continue;
 	    if (CPU_EMU_SIZE < 1 &&
 		(destmode == Areg || destmode == Dreg || destmode == Aind
 		 || destmode == Ad16 || destmode == Ad8r || destmode == Aipi
@@ -586,7 +589,8 @@ static void build_insn(int insn)
 	    destreg = bitval[bitS];
 	    destmode = mode_from_mr(bitval[bits],bitval[bitS]);
 
-	    if (destmode == am_illg) continue;
+	    if (destmode == am_illg)
+		continue;
 	    if (CPU_EMU_SIZE < 1 &&
 		(destmode == Areg || destmode == Dreg || destmode == Aind
 		 || destmode == Ad16 || destmode == Ad8r || destmode == Aipi
@@ -650,7 +654,7 @@ static void build_insn(int insn)
 	if (table68k[opc].mnemo != i_ILLG)
 	    fprintf(stderr, "Double match: %x: %s\n", opc, opcstr);
 	if (find == -1) {
-	    for(find = 0;; find++) {
+	    for (find = 0;; find++) {
 		if (strcmp(mnemonic, lookuptab[find].name) == 0) {
 		    table68k[opc].mnemo = lookuptab[find].mnemo;
 		    break;
@@ -695,12 +699,12 @@ static void build_insn(int insn)
 }
 
 
-void read_table68k ()
+void read_table68k (void)
 {
     int i;
 
     table68k = (struct instr *)xmalloc (65536 * sizeof (struct instr));
-    for(i = 0; i < 65536; i++) {
+    for (i = 0; i < 65536; i++) {
 	table68k[i].mnemo = i_ILLG;
 	table68k[i].handler = -1;
     }
@@ -711,7 +715,7 @@ void read_table68k ()
 
 static int mismatch;
 
-static void handle_merges(long int opcode)
+static void handle_merges (long int opcode)
 {
     uae_u16 smsk;
     uae_u16 dmsk;
@@ -784,7 +788,7 @@ static void handle_merges(long int opcod
     }
 }
 
-void do_merges ()
+void do_merges (void)
 {
     long int opcode;
     int nr = 0;
@@ -798,7 +802,7 @@ void do_merges ()
     nr_cpuop_funcs = nr;
 }
 
-int get_no_mismatches ()
+int get_no_mismatches (void)
 {
     return mismatch;
 }