format all sources

This commit is contained in:
Gwenhael Le Moine 2022-03-24 13:41:22 +01:00
parent b50a915e0a
commit 33c0a11156
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
38 changed files with 10403 additions and 11434 deletions

View file

@ -83,13 +83,13 @@
#include <stdlib.h>
#include <unistd.h>
#include "debugger.h"
#include "device.h"
#include "hp48.h"
#include "hp48_emu.h"
#include "device.h"
#include "x48_x11.h"
#include "timer.h"
#include "debugger.h"
#include "romio.h"
#include "timer.h"
#include "x48_x11.h"
static int interrupt_called = 0;
extern long nibble_masks[16];
@ -121,17 +121,11 @@ void do_in(void) {
}
}
void clear_program_stat(int n) {
saturn.PSTAT[n] = 0;
}
void clear_program_stat(int n) { saturn.PSTAT[n] = 0; }
void set_program_stat(int n) {
saturn.PSTAT[n] = 1;
}
void set_program_stat(int n) { saturn.PSTAT[n] = 1; }
int get_program_stat(int n) {
return saturn.PSTAT[n];
}
int get_program_stat(int n) { return saturn.PSTAT[n]; }
void register_to_status(unsigned char *r) {
int i;
@ -179,30 +173,27 @@ void set_register_nibble(unsigned char *reg, int n, unsigned char val) {
reg[n] = val;
}
unsigned char get_register_nibble(unsigned char *reg, int n) {
return reg[n];
}
unsigned char get_register_nibble(unsigned char *reg, int n) { return reg[n]; }
void set_register_bit(unsigned char *reg, int n) {
reg[n/4] |= (1 << (n%4));
reg[n / 4] |= (1 << (n % 4));
}
void clear_register_bit(unsigned char *reg, int n) {
reg[n/4] &= ~(1 << (n%4));
reg[n / 4] &= ~(1 << (n % 4));
}
int get_register_bit(unsigned char *reg, int n) {
return ((int)(reg[n/4] & (1 << (n%4))) > 0)?1:0;
return ((int)(reg[n / 4] & (1 << (n % 4))) > 0) ? 1 : 0;
}
short conf_tab_sx[] = { 1, 2, 2, 2, 2, 0 };
short conf_tab_gx[] = { 1, 2, 2, 2, 2, 0 };
short conf_tab_sx[] = {1, 2, 2, 2, 2, 0};
short conf_tab_gx[] = {1, 2, 2, 2, 2, 0};
void do_reset(void) {
int i;
for (i = 0; i < 6; i++)
{
for (i = 0; i < 6; i++) {
if (opt_gx)
saturn.mem_cntl[i].unconfigured = conf_tab_gx[i];
else
@ -213,30 +204,24 @@ void do_reset(void) {
#ifdef DEBUG_CONFIG
fprintf(stderr, "%.5lx: RESET\n", saturn.PC);
for (i = 0; i < 6; i++)
{
for (i = 0; i < 6; i++) {
if (saturn.mem_cntl[i].unconfigured)
fprintf(stderr, "MEMORY CONTROLLER %d is unconfigured\n", i);
else
fprintf(stderr, "MEMORY CONTROLLER %d is configured to %.5lx, %.5lx\n",
i, saturn.mem_cntl[i].config[0], saturn.mem_cntl[i].config[1]);
fprintf(stderr, "MEMORY CONTROLLER %d is configured to %.5lx, %.5lx\n", i,
saturn.mem_cntl[i].config[0], saturn.mem_cntl[i].config[1]);
}
#endif
}
void do_inton(void) {
saturn.kbd_ien = 1;
}
void do_inton(void) { saturn.kbd_ien = 1; }
void do_intoff(void) {
saturn.kbd_ien = 0;
}
void do_intoff(void) { saturn.kbd_ien = 0; }
void do_return_interupt(void) {
if (saturn.int_pending) {
#ifdef DEBUG_INTERRUPT
fprintf(stderr, "PC = %.5lx: RTI SERVICE PENDING INTERRUPT\n",
saturn.PC);
fprintf(stderr, "PC = %.5lx: RTI SERVICE PENDING INTERRUPT\n", saturn.PC);
#endif
saturn.int_pending = 0;
saturn.intenable = 0;
@ -255,7 +240,6 @@ void do_return_interupt(void) {
schedule_event = 0;
sched_adjtime = 0;
}
}
}
@ -314,10 +298,8 @@ void do_unconfigure(void) {
conf |= saturn.C[i];
}
for (i = 0; i < 6; i++)
{
if (saturn.mem_cntl[i].config[0] == conf)
{
for (i = 0; i < 6; i++) {
if (saturn.mem_cntl[i].config[0] == conf) {
if (opt_gx)
saturn.mem_cntl[i].unconfigured = conf_tab_gx[i];
else
@ -330,13 +312,12 @@ void do_unconfigure(void) {
#ifdef DEBUG_CONFIG
fprintf(stderr, "%.5lx: UNCNFG %.5x:\n", saturn.PC, conf);
for (i = 0; i < 6; i++)
{
for (i = 0; i < 6; i++) {
if (saturn.mem_cntl[i].unconfigured)
fprintf(stderr, "MEMORY CONTROLLER %d is unconfigured\n", i);
else
fprintf(stderr, "MEMORY CONTROLLER %d is configured to %.5lx, %.5lx\n",
i, saturn.mem_cntl[i].config[0], saturn.mem_cntl[i].config[1]);
fprintf(stderr, "MEMORY CONTROLLER %d is configured to %.5lx, %.5lx\n", i,
saturn.mem_cntl[i].config[0], saturn.mem_cntl[i].config[1]);
}
#endif
}
@ -351,10 +332,8 @@ void do_configure(void) {
conf |= saturn.C[i];
}
for (i = 0; i < 6; i++)
{
if (saturn.mem_cntl[i].unconfigured)
{
for (i = 0; i < 6; i++) {
if (saturn.mem_cntl[i].unconfigured) {
saturn.mem_cntl[i].unconfigured--;
saturn.mem_cntl[i].config[saturn.mem_cntl[i].unconfigured] = conf;
break;
@ -363,25 +342,22 @@ void do_configure(void) {
#ifdef DEBUG_CONFIG
fprintf(stderr, "%.5lx: CONFIG %.5lx:\n", saturn.PC, conf);
for (i = 0; i < 6; i++)
{
for (i = 0; i < 6; i++) {
if (saturn.mem_cntl[i].unconfigured)
fprintf(stderr, "MEMORY CONTROLLER %d is unconfigured\n", i);
else
fprintf(stderr, "MEMORY CONTROLLER %d at %.5lx, %.5lx\n",
i, saturn.mem_cntl[i].config[0], saturn.mem_cntl[i].config[1]);
fprintf(stderr, "MEMORY CONTROLLER %d at %.5lx, %.5lx\n", i,
saturn.mem_cntl[i].config[0], saturn.mem_cntl[i].config[1]);
}
#endif
}
int get_identification(void) {
int i;
static int chip_id[]
= { 0, 0, 0, 0, 0x05, 0xf6, 0x07, 0xf8, 0x01, 0xf2, 0, 0 };
static int chip_id[] = {0, 0, 0, 0, 0x05, 0xf6, 0x07, 0xf8, 0x01, 0xf2, 0, 0};
int id;
for (i = 0; i < 6; i++)
{
for (i = 0; i < 6; i++) {
if (saturn.mem_cntl[i].unconfigured)
break;
}
@ -392,26 +368,22 @@ int get_identification(void) {
#ifdef DEBUG_ID
fprintf(stderr, "%.5lx: C=ID, returning: %x\n", saturn.PC, id);
for (i = 0; i < 6; i++)
{
for (i = 0; i < 6; i++) {
if (saturn.mem_cntl[i].unconfigured == 2)
fprintf(stderr, "MEMORY CONTROLLER %d is unconfigured\n", i);
else if (saturn.mem_cntl[i].unconfigured == 1)
{
else if (saturn.mem_cntl[i].unconfigured == 1) {
if (i == 0)
fprintf(stderr, "MEMORY CONTROLLER %d unconfigured\n", i);
else
fprintf(stderr, "MEMORY CONTROLLER %d configured to ????? %.5lx\n",
i, saturn.mem_cntl[i].config[1]);
}
else
fprintf(stderr, "MEMORY CONTROLLER %d configured to %.5lx, %.5lx\n",
i, saturn.mem_cntl[i].config[0], saturn.mem_cntl[i].config[1]);
fprintf(stderr, "MEMORY CONTROLLER %d configured to ????? %.5lx\n", i,
saturn.mem_cntl[i].config[1]);
} else
fprintf(stderr, "MEMORY CONTROLLER %d configured to %.5lx, %.5lx\n", i,
saturn.mem_cntl[i].config[0], saturn.mem_cntl[i].config[1]);
}
#endif
for (i = 0; i < 3; i++)
{
for (i = 0; i < 3; i++) {
saturn.C[i] = id & 0x0f;
id >>= 4;
}
@ -426,7 +398,8 @@ void do_shutdown(void) {
device.display_touched = 0;
update_display();
#ifdef HAVE_XSHM
if (disp.display_update) refresh_display();
if (disp.display_update)
refresh_display();
#endif
}
@ -463,7 +436,8 @@ void do_shutdown(void) {
got_alarm = 0;
#ifdef HAVE_XSHM
if (disp.display_update) refresh_display();
if (disp.display_update)
refresh_display();
#endif
ticks = get_t1_t2();
@ -479,29 +453,23 @@ void do_shutdown(void) {
wake = 1;
}
if (saturn.timer2 <= 0)
{
if (saturn.t2_ctrl & 0x04)
{
if (saturn.timer2 <= 0) {
if (saturn.t2_ctrl & 0x04) {
wake = 1;
}
if (saturn.t2_ctrl & 0x02)
{
if (saturn.t2_ctrl & 0x02) {
wake = 1;
saturn.t2_ctrl |= 0x08;
do_interupt();
}
}
if (saturn.timer1 <= 0)
{
if (saturn.timer1 <= 0) {
saturn.timer1 &= 0x0f;
if (saturn.t1_ctrl & 0x04)
{
if (saturn.t1_ctrl & 0x04) {
wake = 1;
}
if (saturn.t1_ctrl & 0x03)
{
if (saturn.t1_ctrl & 0x03) {
wake = 1;
saturn.t1_ctrl |= 0x08;
do_interupt();
@ -518,8 +486,7 @@ void do_shutdown(void) {
alarms++;
}
if (enter_debugger)
{
if (enter_debugger) {
wake = 1;
}
} while (wake == 0);
@ -529,24 +496,40 @@ void do_shutdown(void) {
}
void set_hardware_stat(int op) {
if (op & 1) saturn.XM = 1;
if (op & 2) saturn.SB = 1;
if (op & 4) saturn.SR = 1;
if (op & 8) saturn.MP = 1;
if (op & 1)
saturn.XM = 1;
if (op & 2)
saturn.SB = 1;
if (op & 4)
saturn.SR = 1;
if (op & 8)
saturn.MP = 1;
}
void clear_hardware_stat(int op) {
if (op & 1) saturn.XM = 0;
if (op & 2) saturn.SB = 0;
if (op & 4) saturn.SR = 0;
if (op & 8) saturn.MP = 0;
if (op & 1)
saturn.XM = 0;
if (op & 2)
saturn.SB = 0;
if (op & 4)
saturn.SR = 0;
if (op & 8)
saturn.MP = 0;
}
int is_zero_hardware_stat(int op) {
if (op & 1) if (saturn.XM != 0) return 0;
if (op & 2) if (saturn.SB != 0) return 0;
if (op & 4) if (saturn.SR != 0) return 0;
if (op & 8) if (saturn.MP != 0) return 0;
if (op & 1)
if (saturn.XM != 0)
return 0;
if (op & 2)
if (saturn.SB != 0)
return 0;
if (op & 4)
if (saturn.SR != 0)
return 0;
if (op & 8)
if (saturn.MP != 0)
return 0;
return 1;
}
@ -561,7 +544,7 @@ void push_return_addr(long addr) {
}
#endif
for (i = 1; i < NR_RSTK; i++)
saturn.rstk[i-1] = saturn.rstk[i];
saturn.rstk[i - 1] = saturn.rstk[i];
saturn.rstkp--;
}
saturn.rstk[saturn.rstkp] = addr;
@ -581,14 +564,14 @@ long pop_return_addr(void) {
fprintf(stderr, "RSTK[%d] %.5x\n", i, saturn.rstk[i]);
}
fprintf(stderr, "POP %.5x:\n",
(saturn.rstkp >= 0) ? saturn.rstk[saturn.rstkp]:0);
(saturn.rstkp >= 0) ? saturn.rstk[saturn.rstkp] : 0);
#endif
if (saturn.rstkp < 0)
return 0;
return saturn.rstk[saturn.rstkp--];
}
char * make_hexstr(long addr, int n) {
char *make_hexstr(long addr, int n) {
static char str[44];
int i, t, trunc;
@ -598,7 +581,7 @@ char * make_hexstr(long addr, int n) {
trunc = 1;
}
for (i = 0; i < n; i++) {
t = read_nibble(addr+i);
t = read_nibble(addr + i);
if (t <= 9)
str[i] = '0' + t;
else
@ -607,9 +590,9 @@ char * make_hexstr(long addr, int n) {
str[n] = '\0';
if (trunc) {
str[n] = '.';
str[n+1] = '.';
str[n+2] = '.';
str[n+3] = '\0';
str[n + 1] = '.';
str[n + 2] = '.';
str[n + 3] = '\0';
}
return str;
}
@ -698,17 +681,11 @@ void add_address(word_20 *dat, int add) {
*dat &= 0xfffff;
}
static int start_fields[] = {
-1, 0, 2, 0, 15, 3, 0, 0,
-1, 0, 2, 0, 15, 3, 0, 0,
0, 0, 0
};
static int start_fields[] = {-1, 0, 2, 0, 15, 3, 0, 0, -1, 0,
2, 0, 15, 3, 0, 0, 0, 0, 0};
static int end_fields[] = {
-1, -1, 2, 2, 15, 14, 1, 15,
-1, -1, 2, 2, 15, 14, 1, 4,
3, 2, 0
};
static int end_fields[] = {-1, -1, 2, 2, 15, 14, 1, 15, -1, -1,
2, 2, 15, 14, 1, 4, 3, 2, 0};
static inline int get_start(int code) {
int s;

View file

@ -38,8 +38,8 @@
#include "global.h"
extern char * append_str __ProtoType__((char *buf, char *string));
extern char * append_tab __ProtoType__((char *buf));
extern char * append_tab_16 __ProtoType__((char *buf));
extern char *append_str __ProtoType__((char *buf, char *string));
extern char *append_tab __ProtoType__((char *buf));
extern char *append_tab_16 __ProtoType__((char *buf));
#endif /* !_APPEND_H */

View file

@ -39,8 +39,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/stat.h>
#include <unistd.h>
#include "global.h"
#include "romio.h"
@ -61,13 +61,12 @@ int main(int argc, char **argv) {
if (argc < 2) {
fprintf(stderr, "usage: %s rom-file\n", argv[0]);
exit (1);
exit(1);
}
if (!read_rom_file(argv[1], &rom, &rom_size))
{
if (!read_rom_file(argv[1], &rom, &rom_size)) {
fprintf(stderr, "%s: can\'t read ROM from %s\n", argv[0], argv[1]);
exit (1);
exit(1);
}
if (opt_gx != 0)
@ -82,7 +81,6 @@ int main(int argc, char **argv) {
version[6] = '\0';
printf("ROM Version is %s\n", version);
for (i = 0x100; i < 0x140; i++) {
rom[i] = 0x0;
}

View file

@ -45,4 +45,3 @@
#define COLOR_MODE_COLOR 3
#endif /* !_CONSTANTS_H */

File diff suppressed because it is too large Load diff

View file

@ -53,9 +53,9 @@
#include <stdlib.h>
#include "device.h"
#include "hp48.h"
#include "hp48_emu.h"
#include "device.h"
#include "timer.h"
#include "x48_x11.h"
@ -175,10 +175,10 @@ void check_devices(void) {
#if 0
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
void check_out_register(void) {
static int au = -2;

View file

@ -51,6 +51,7 @@
#define _DEVICE_H 1
#include "global.h"
#include "hp48.h"
#define DISP_INSTR_OFF 0x10

File diff suppressed because it is too large Load diff

View file

@ -45,13 +45,12 @@
* $Id: dump2rom.c,v 1.7 1995/01/11 18:20:01 ecd Exp ecd $
*/
#include "global.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
#ifdef SUNOS
#include <memory.h>
#endif
@ -67,36 +66,28 @@ int write_mem_file(char *name, unsigned char *mem, int size) {
unsigned char byte;
int i, j;
if (NULL == (fp = fopen(name, "w")))
{
if (NULL == (fp = fopen(name, "w"))) {
fprintf(stderr, "can\'t open %s\n", name);
return 0;
}
if (NULL == (tmp_mem = (unsigned char *)malloc((size_t)size / 2)))
{
for (i = 0, j = 0; i < size / 2; i++)
{
if (NULL == (tmp_mem = (unsigned char *)malloc((size_t)size / 2))) {
for (i = 0, j = 0; i < size / 2; i++) {
byte = (mem[j++] & 0x0f);
byte |= (mem[j++] << 4) & 0xf0;
if (1 != fwrite(&byte, 1, 1, fp))
{
if (1 != fwrite(&byte, 1, 1, fp)) {
fprintf(stderr, "can\'t write %s\n", name);
fclose(fp);
return 0;
}
}
}
else
{
for (i = 0, j = 0; i < size / 2; i++)
{
} else {
for (i = 0, j = 0; i < size / 2; i++) {
tmp_mem[i] = (mem[j++] & 0x0f);
tmp_mem[i] |= (mem[j++] << 4) & 0xf0;
}
if (fwrite(tmp_mem, 1, (size_t)size / 2, fp) != size / 2)
{
if (fwrite(tmp_mem, 1, (size_t)size / 2, fp) != size / 2) {
fprintf(stderr, "can\'t write %s\n", name);
fclose(fp);
free(tmp_mem);
@ -117,17 +108,17 @@ int main(int argc, char **argv) {
if (argc < 2) {
fprintf(stderr, "usage: %s hp48-dump-file\n", argv[0]);
exit (1);
exit(1);
}
if ((dump = fopen(argv[1], "r")) == NULL) {
fprintf(stderr, "%s: can\'t open %s\n", argv[0], argv[1]);
exit (1);
exit(1);
}
if ((core = (unsigned char *)malloc(0x100000)) == NULL) {
fprintf(stderr, "%s: can\'t malloc %d bytes\n", argv[0], 0x100000);
exit (1);
exit(1);
}
memset(core, 0, 0x100000);
@ -160,8 +151,8 @@ int main(int argc, char **argv) {
break;
}
if (ch != ':') {
fprintf(stderr, "%s: Illegal char %c, expected \':\' at %lx\n",
argv[0], ch, addr);
fprintf(stderr, "%s: Illegal char %c, expected \':\' at %lx\n", argv[0],
ch, addr);
break;
}
for (i = 0; i < 16; i++) {
@ -185,8 +176,8 @@ int main(int argc, char **argv) {
if ((ch = fgetc(dump)) < 0)
break;
if (ch != '\n') {
fprintf(stderr, "%s: Illegal char %c, expected \'\\n\' at %lx\n",
argv[0], ch, addr);
fprintf(stderr, "%s: Illegal char %c, expected \'\\n\' at %lx\n", argv[0],
ch, addr);
break;
}
}
@ -198,11 +189,10 @@ int main(int argc, char **argv) {
size = 0x100000;
else
size = 0x80000;
if (!write_mem_file(DEFAULT_ROM_FILE, core, size))
{
if (!write_mem_file(DEFAULT_ROM_FILE, core, size)) {
fprintf(stderr, "%s: can\'t write to %s\n", argv[0], DEFAULT_ROM_FILE);
exit (1);
exit(1);
}
exit (0);
exit(0);
}

View file

@ -43,17 +43,16 @@
* $Id: emulate.c,v 1.16 1995/01/11 18:20:01 ecd Exp ecd $
*/
#include "global.h"
#include <stdio.h>
#include "debugger.h"
#include "device.h"
#include "hp48.h"
#include "hp48_emu.h"
#include "device.h"
#include "timer.h"
#include "x48_x11.h"
#include "debugger.h"
extern int throttle;
@ -109,10 +108,8 @@ unsigned long delta_t_16;
unsigned long delta_i;
word_64 run;
static word_20 jumpmasks[] = {
0xffffffff, 0xfffffff0, 0xffffff00, 0xfffff000,
0xffff0000, 0xfff00000, 0xff000000, 0xf0000000
};
static word_20 jumpmasks[] = {0xffffffff, 0xfffffff0, 0xffffff00, 0xfffff000,
0xffff0000, 0xfff00000, 0xff000000, 0xf0000000};
int decode_group_80(void) {
int t, op3, op4, op5, op6;
@ -212,7 +209,7 @@ int decode_group_80(void) {
t = 0;
else
t = 1;
saturn.CARRY = (get_register_bit(REG, op5) == t)?1:0;
saturn.CARRY = (get_register_bit(REG, op5) == t) ? 1 : 0;
if (saturn.CARRY) {
saturn.PC += 5;
op6 = read_nibbles(saturn.PC, 2);
@ -520,7 +517,7 @@ int decode_group_1(void) {
case 4:
op3 = read_nibble(saturn.PC + 2);
op = op3 < 8 ? 0xf : 6;
switch(op3 & 7) {
switch (op3 & 7) {
case 0: /* DAT0=A */
saturn.PC += 3;
store(saturn.D0, saturn.A, op);
@ -560,44 +557,44 @@ int decode_group_1(void) {
op3 = read_nibble(saturn.PC + 2);
op4 = read_nibble(saturn.PC + 3);
if (op3 >= 8) {
switch(op3 & 7) {
switch (op3 & 7) {
case 0: /* DAT0=A */
saturn.PC += 4;
store_n(saturn.D0, saturn.A, op4+1);
store_n(saturn.D0, saturn.A, op4 + 1);
return 0;
case 1: /* DAT1=A */
saturn.PC += 4;
store_n(saturn.D1, saturn.A, op4+1);
store_n(saturn.D1, saturn.A, op4 + 1);
return 0;
case 2: /* A=DAT0 */
saturn.PC += 4;
recall_n(saturn.A, saturn.D0, op4+1);
recall_n(saturn.A, saturn.D0, op4 + 1);
return 0;
case 3: /* A=DAT1 */
saturn.PC += 4;
recall_n(saturn.A, saturn.D1, op4+1);
recall_n(saturn.A, saturn.D1, op4 + 1);
return 0;
case 4: /* DAT0=C */
saturn.PC += 4;
store_n(saturn.D0, saturn.C, op4+1);
store_n(saturn.D0, saturn.C, op4 + 1);
return 0;
case 5: /* DAT1=C */
saturn.PC += 4;
store_n(saturn.D1, saturn.C, op4+1);
store_n(saturn.D1, saturn.C, op4 + 1);
return 0;
case 6: /* C=DAT0 */
saturn.PC += 4;
recall_n(saturn.C, saturn.D0, op4+1);
recall_n(saturn.C, saturn.D0, op4 + 1);
return 0;
case 7: /* C=DAT1 */
saturn.PC += 4;
recall_n(saturn.C, saturn.D1, op4+1);
recall_n(saturn.C, saturn.D1, op4 + 1);
return 0;
default:
return 1;
}
} else {
switch(op3) {
switch (op3) {
case 0: /* DAT0=A */
saturn.PC += 4;
store(saturn.D0, saturn.A, op4);
@ -637,45 +634,45 @@ int decode_group_1(void) {
case 6:
op3 = read_nibble(saturn.PC + 2);
saturn.PC += 3;
add_address(&saturn.D0, op3+1);
add_address(&saturn.D0, op3 + 1);
return 0;
case 7:
op3 = read_nibble(saturn.PC + 2);
saturn.PC += 3;
add_address(&saturn.D1, op3+1);
add_address(&saturn.D1, op3 + 1);
return 0;
case 8:
op3 = read_nibble(saturn.PC + 2);
saturn.PC += 3;
add_address(&saturn.D0, -(op3+1));
add_address(&saturn.D0, -(op3 + 1));
return 0;
case 9:
load_addr(&saturn.D0, saturn.PC+2, 2);
load_addr(&saturn.D0, saturn.PC + 2, 2);
saturn.PC += 4;
return 0;
case 0xa:
load_addr(&saturn.D0, saturn.PC+2, 4);
load_addr(&saturn.D0, saturn.PC + 2, 4);
saturn.PC += 6;
return 0;
case 0xb:
load_addr(&saturn.D0, saturn.PC+2, 5);
load_addr(&saturn.D0, saturn.PC + 2, 5);
saturn.PC += 7;
return 0;
case 0xc:
op3 = read_nibble(saturn.PC + 2);
saturn.PC += 3;
add_address(&saturn.D1, -(op3+1));
add_address(&saturn.D1, -(op3 + 1));
return 0;
case 0xd:
load_addr(&saturn.D1, saturn.PC+2, 2);
load_addr(&saturn.D1, saturn.PC + 2, 2);
saturn.PC += 4;
return 0;
case 0xe:
load_addr(&saturn.D1, saturn.PC+2, 4);
load_addr(&saturn.D1, saturn.PC + 2, 4);
saturn.PC += 6;
return 0;
case 0xf:
load_addr(&saturn.D1, saturn.PC+2, 5);
load_addr(&saturn.D1, saturn.PC + 2, 5);
saturn.PC += 7;
return 0;
default:
@ -735,19 +732,19 @@ static inline int decode_8_thru_f(int op1) {
switch (op5 & 3) {
case 0: /* A=A+CON */
saturn.PC += 6;
add_register_constant(saturn.A, op4, op6+1);
add_register_constant(saturn.A, op4, op6 + 1);
return 0;
case 1: /* B=B+CON */
saturn.PC += 6;
add_register_constant(saturn.B, op4, op6+1);
add_register_constant(saturn.B, op4, op6 + 1);
return 0;
case 2: /* C=C+CON */
saturn.PC += 6;
add_register_constant(saturn.C, op4, op6+1);
add_register_constant(saturn.C, op4, op6 + 1);
return 0;
case 3: /* D=D+CON */
saturn.PC += 6;
add_register_constant(saturn.D, op4, op6+1);
add_register_constant(saturn.D, op4, op6 + 1);
return 0;
default:
return 1;
@ -756,19 +753,19 @@ static inline int decode_8_thru_f(int op1) {
switch (op5 & 3) {
case 0: /* A=A-CON */
saturn.PC += 6;
sub_register_constant(saturn.A, op4, op6+1);
sub_register_constant(saturn.A, op4, op6 + 1);
return 0;
case 1: /* B=B-CON */
saturn.PC += 6;
sub_register_constant(saturn.B, op4, op6+1);
sub_register_constant(saturn.B, op4, op6 + 1);
return 0;
case 2: /* C=C-CON */
saturn.PC += 6;
sub_register_constant(saturn.C, op4, op6+1);
sub_register_constant(saturn.C, op4, op6 + 1);
return 0;
case 3: /* D=D-CON */
saturn.PC += 6;
sub_register_constant(saturn.D, op4, op6+1);
sub_register_constant(saturn.D, op4, op6 + 1);
return 0;
default:
return 1;
@ -960,7 +957,7 @@ static inline int decode_8_thru_f(int op1) {
}
case 0xb:
op4 = read_nibble(saturn.PC + 3);
switch(op4) {
switch (op4) {
case 2: /* PC=A */
jumpaddr = dat_to_addr(saturn.A);
saturn.PC = jumpaddr;
@ -1049,9 +1046,9 @@ static inline int decode_8_thru_f(int op1) {
case 7:
op3 = read_nibble(saturn.PC + 2);
if (op2 == 6)
saturn.CARRY = (get_program_stat(op3) == 0)?1:0;
saturn.CARRY = (get_program_stat(op3) == 0) ? 1 : 0;
else
saturn.CARRY = (get_program_stat(op3) != 0)?1:0;
saturn.CARRY = (get_program_stat(op3) != 0) ? 1 : 0;
if (saturn.CARRY) {
saturn.PC += 3;
op4 = read_nibbles(saturn.PC, 2);
@ -1071,9 +1068,9 @@ static inline int decode_8_thru_f(int op1) {
case 9:
op3 = read_nibble(saturn.PC + 2);
if (op2 == 8)
saturn.CARRY = (saturn.P != op3)?1:0;
saturn.CARRY = (saturn.P != op3) ? 1 : 0;
else
saturn.CARRY = (saturn.P == op3)?1:0;
saturn.CARRY = (saturn.P == op3) ? 1 : 0;
if (saturn.CARRY) {
saturn.PC += 3;
op4 = read_nibbles(saturn.PC, 2);
@ -1091,7 +1088,7 @@ static inline int decode_8_thru_f(int op1) {
return 0;
case 0xa:
op3 = read_nibble(saturn.PC + 2);
switch(op3) {
switch (op3) {
case 0: /* ?A=B */
saturn.CARRY = is_equal_register(saturn.A, saturn.B, A_FIELD);
break;
@ -1186,16 +1183,20 @@ static inline int decode_8_thru_f(int op1) {
saturn.CARRY = is_less_register(saturn.D, saturn.C, A_FIELD);
break;
case 8: /* ?A>=B */
saturn.CARRY = is_greater_or_equal_register(saturn.A, saturn.B, A_FIELD);
saturn.CARRY =
is_greater_or_equal_register(saturn.A, saturn.B, A_FIELD);
break;
case 9: /* ?B>=C */
saturn.CARRY = is_greater_or_equal_register(saturn.B, saturn.C, A_FIELD);
saturn.CARRY =
is_greater_or_equal_register(saturn.B, saturn.C, A_FIELD);
break;
case 0xa: /* ?C>=A */
saturn.CARRY = is_greater_or_equal_register(saturn.C, saturn.A, A_FIELD);
saturn.CARRY =
is_greater_or_equal_register(saturn.C, saturn.A, A_FIELD);
break;
case 0xb: /* ?D>=C */
saturn.CARRY = is_greater_or_equal_register(saturn.D, saturn.C, A_FIELD);
saturn.CARRY =
is_greater_or_equal_register(saturn.D, saturn.C, A_FIELD);
break;
case 0xc: /* ?A<=B */
saturn.CARRY = is_less_or_equal_register(saturn.A, saturn.B, A_FIELD);
@ -1259,7 +1260,7 @@ static inline int decode_8_thru_f(int op1) {
case 9:
op3 = read_nibble(saturn.PC + 2);
if (op2 < 8) {
switch(op3) {
switch (op3) {
case 0: /* ?A=B */
saturn.CARRY = is_equal_register(saturn.A, saturn.B, op2);
break;
@ -1384,7 +1385,7 @@ static inline int decode_8_thru_f(int op1) {
case 0xa:
op3 = read_nibble(saturn.PC + 2);
if (op2 < 8) {
switch(op3) {
switch (op3) {
case 0: /* A=A+B */
saturn.PC += 3;
add_register(saturn.A, saturn.A, saturn.B, op2);
@ -1454,7 +1455,7 @@ static inline int decode_8_thru_f(int op1) {
}
} else {
op2 &= 7;
switch(op3) {
switch (op3) {
case 0: /* A=0 */
saturn.PC += 3;
zero_register(saturn.A, op2);
@ -1666,7 +1667,7 @@ static inline int decode_8_thru_f(int op1) {
}
}
case 0xc:
switch(op2) {
switch (op2) {
case 0: /* A=A+B */
saturn.PC += 2;
add_register(saturn.A, saturn.A, saturn.B, A_FIELD);
@ -1735,7 +1736,7 @@ static inline int decode_8_thru_f(int op1) {
return 1;
}
case 0xd:
switch(op2) {
switch (op2) {
case 0: /* A=0 */
saturn.PC += 2;
zero_register(saturn.A, A_FIELD);
@ -2029,7 +2030,7 @@ inline int step_instruction(void) {
case 0xe:
op2 = read_nibble(saturn.PC + 2);
op3 = read_nibble(saturn.PC + 3);
switch(op3) {
switch (op3) {
case 0: /* A=A&B */
saturn.PC += 4;
and_register(saturn.A, saturn.A, saturn.B, op2);
@ -2156,7 +2157,7 @@ inline int step_instruction(void) {
op2 = read_nibbles(saturn.PC + 1, 3);
if (op2 == 0x003) {
saturn.PC += 4;
} else if(op2 == 0x004) {
} else if (op2 == 0x004) {
op3 = read_nibbles(saturn.PC + 4, 1);
saturn.PC += 5;
if (op3 != 0) {
@ -2175,7 +2176,7 @@ inline int step_instruction(void) {
if (op2 & 0x800)
op2 |= jumpmasks[3];
jumpaddr = (op2 + saturn.PC + 4) & 0xfffff;
push_return_addr(saturn.PC+4);
push_return_addr(saturn.PC + 4);
saturn.PC = jumpaddr;
break;
default:
@ -2220,15 +2221,17 @@ inline void schedule(void) {
schedule_event = sched_timer2;
#ifdef DEBUG_SCHED
fprintf(stderr, "next timer 2 step: %ld, event: %ld\n",
sched_timer2, schedule_event);
fprintf(stderr, "next timer 2 step: %ld, event: %ld\n", sched_timer2,
schedule_event);
#endif
if (device_check) {
device_check = 0;
if ((sched_display -= steps) <= 0) {
if (device.display_touched) device.display_touched -= steps;
if (device.display_touched < 0) device.display_touched = 1;
if (device.display_touched)
device.display_touched -= steps;
if (device.display_touched < 0)
device.display_touched = 1;
#ifdef DEBUG_DISP_SCHED
fprintf(stderr, "check_device: disp_when %d, disp_touched %d\n",
sched_display, device.display_touched);
@ -2239,7 +2242,8 @@ inline void schedule(void) {
if (device.display_touched) {
if (device.display_touched < sched_display)
sched_display = device.display_touched - 1;
if (sched_display < schedule_event) schedule_event = sched_display;
if (sched_display < schedule_event)
schedule_event = sched_display;
}
}
@ -2249,11 +2253,12 @@ inline void schedule(void) {
receive_char();
}
}
if (sched_receive < schedule_event) schedule_event = sched_receive;
if (sched_receive < schedule_event)
schedule_event = sched_receive;
#ifdef DEBUG_SCHED
fprintf(stderr, "next receive: %ld, event: %ld\n",
sched_receive, schedule_event);
fprintf(stderr, "next receive: %ld, event: %ld\n", sched_receive,
schedule_event);
#endif
if ((sched_adjtime -= steps) <= 0) {
@ -2288,14 +2293,14 @@ inline void schedule(void) {
} else {
adj_time_pending = 1;
}
}
if (sched_adjtime < schedule_event) schedule_event = sched_adjtime;
if (sched_adjtime < schedule_event)
schedule_event = sched_adjtime;
#ifdef DEBUG_SCHED
fprintf(stderr, "next adjtime: %ld, event: %ld\n",
sched_adjtime, schedule_event);
fprintf(stderr, "next adjtime: %ld, event: %ld\n", sched_adjtime,
schedule_event);
#endif
if ((sched_timer1 -= steps) <= 0) {
@ -2311,11 +2316,12 @@ inline void schedule(void) {
do_interupt();
}
}
if (sched_timer1 < schedule_event) schedule_event = sched_timer1;
if (sched_timer1 < schedule_event)
schedule_event = sched_timer1;
#ifdef DEBUG_SCHED
fprintf(stderr, "next timer 1 step: %ld, event: %ld\n",
sched_timer1, schedule_event);
fprintf(stderr, "next timer 1 step: %ld, event: %ld\n", sched_timer1,
schedule_event);
#endif
if ((sched_statistics -= steps) <= 0) {
@ -2332,11 +2338,13 @@ inline void schedule(void) {
delta_i = instructions - old_stat_instr;
old_stat_instr = instructions;
if (delta_t_1 > 0) {
t1_i_per_tick = ((NR_SAMPLES - 1) * t1_i_per_tick +
(delta_i / delta_t_16)) / NR_SAMPLES;
t1_i_per_tick =
((NR_SAMPLES - 1) * t1_i_per_tick + (delta_i / delta_t_16)) /
NR_SAMPLES;
t2_i_per_tick = t1_i_per_tick / 512;
saturn.i_per_s = ((NR_SAMPLES - 1) * saturn.i_per_s +
(delta_i / delta_t_1)) / NR_SAMPLES;
saturn.i_per_s =
((NR_SAMPLES - 1) * saturn.i_per_s + (delta_i / delta_t_1)) /
NR_SAMPLES;
} else {
t1_i_per_tick = 8192;
t2_i_per_tick = 16;
@ -2361,8 +2369,8 @@ inline void schedule(void) {
schedule_event = sched_statistics;
#ifdef DEBUG_SCHED
fprintf(stderr, "next statistics: %ld, event: %ld\n",
sched_statistics, schedule_event);
fprintf(stderr, "next statistics: %ld, event: %ld\n", sched_statistics,
schedule_event);
#endif
if ((sched_instr_rollover -= steps) <= 0) {
@ -2386,7 +2394,8 @@ inline void schedule(void) {
if (got_alarm) {
got_alarm = 0;
#ifdef HAVE_XSHM
if (disp.display_update) refresh_display();
if (disp.display_update)
refresh_display();
#endif
GetEvent();
}
@ -2418,8 +2427,8 @@ int emulate(void) {
{
int i;
for (i=0;
i < sizeof(saturn.keybuf.rows)/sizeof(saturn.keybuf.rows[0]);
for (i = 0;
i < sizeof(saturn.keybuf.rows) / sizeof(saturn.keybuf.rows[0]);
i++) {
if (saturn.keybuf.rows[i] || throttle) {
#ifdef SOLARIS
@ -2427,7 +2436,8 @@ int emulate(void) {
#else
gettimeofday(&tv, &tz);
#endif
while ((tv.tv_sec == tv2.tv_sec) && ((tv.tv_usec - tv2.tv_usec) < 2)) {
while ((tv.tv_sec == tv2.tv_sec) &&
((tv.tv_usec - tv2.tv_usec) < 2)) {
gettimeofday(&tv, &tz);
}
@ -2438,14 +2448,13 @@ int emulate(void) {
}
}
/* We need to throttle the speed here. */
/* We need to throttle the speed here. */
if (schedule_event < 0) {
//puts("bug");
// schedule_event = 0;
// puts("bug");
// schedule_event = 0;
}
if (schedule_event-- <= 0)
{
if (schedule_event-- <= 0) {
schedule();
}
} while (!enter_debugger);

View file

@ -31,17 +31,20 @@
#include "global.h"
#include "resources.h"
char errbuf[1024] = { 0, };
char fixbuf[1024] = { 0, };
char errbuf[1024] = {
0,
};
char fixbuf[1024] = {
0,
};
void fatal_exit(void) {
if (quiet)
exit (1);
exit(1);
if (errbuf[0] == '\0')
{
if (errbuf[0] == '\0') {
fprintf(stderr, "%s: FATAL ERROR, exit.\n", progname);
exit (1);
exit(1);
}
fprintf(stderr, "%s: FATAL ERROR, exit.\n - %s\n", progname, errbuf);
@ -49,5 +52,5 @@ void fatal_exit(void) {
if (fixbuf[0] != '\0')
fprintf(stderr, " - %s\n", fixbuf);
exit (1);
exit(1);
}

View file

@ -32,6 +32,6 @@
extern char errbuf[1024];
extern char fixbuf[1024];
extern void fatal_exit __ProtoType__ ((void));
extern void fatal_exit __ProtoType__((void));
#endif /* !_ERRORS_H */

View file

@ -117,14 +117,14 @@ extern int fprintf __ProtoType__((FILE *, char *, ...));
extern int sscanf __ProtoType__((char *, char *, ...));
extern void fflush __ProtoType__((FILE *));
extern int fseek __ProtoType__((FILE *, long, int));
extern int fread __ProtoType__((void *, int, int, FILE*));
extern int fwrite __ProtoType__((void *, int, int, FILE*));
extern int fread __ProtoType__((void *, int, int, FILE *));
extern int fwrite __ProtoType__((void *, int, int, FILE *));
extern void fclose __ProtoType__((FILE *));
extern int fgetc __ProtoType__((FILE *));
extern void bzero __ProtoType__((void *, int));
extern time_t time __ProtoType__((time_t *));
extern int select __ProtoType__((int, fd_set *, fd_set *,
fd_set *, struct timeval *));
extern int select __ProtoType__((int, fd_set *, fd_set *, fd_set *,
struct timeval *));
extern int setitimer __ProtoType__((int, struct itimerval *,
struct itimerval *));
extern int gethostname __ProtoType__((char *, int));

View file

@ -69,7 +69,7 @@
#include "mmu.h"
#ifdef HAVE_STDINT_H
# include <stdint.h>
#include <stdint.h>
#endif
#define RAM_SIZE_SX 0x10000
@ -276,9 +276,9 @@ extern void receive_char __ProtoType__((void));
extern void do_kbd_int __ProtoType__((void));
extern void do_interupt __ProtoType__((void));
extern void (*write_nibble) __ProtoType__((long addr, int val));
extern int (*read_nibble) __ProtoType__((long addr));
extern int (*read_nibble_crc) __ProtoType__((long addr));
extern void(*write_nibble) __ProtoType__((long addr, int val));
extern int(*read_nibble) __ProtoType__((long addr));
extern int(*read_nibble_crc) __ProtoType__((long addr));
extern int emulate __ProtoType__((void));
extern int step_instruction __ProtoType__((void));
@ -288,6 +288,5 @@ extern int read_rom __ProtoType__((const char *fname));
extern int read_files __ProtoType__((void));
extern int write_files __ProtoType__((void));
extern void load_addr __ProtoType__((word_20 *dat, long addr,
int n));
extern void load_addr __ProtoType__((word_20 * dat, long addr, int n));
#endif /* !_HP48_H */

View file

@ -100,29 +100,23 @@ extern int get_register_bit __ProtoType__((unsigned char *reg, int n));
extern void set_register_nibble __ProtoType__((unsigned char *reg, int n,
unsigned char val));
extern unsigned char get_register_nibble __ProtoType__((unsigned char *reg, int n));
extern void register_to_address __ProtoType__((unsigned char *reg,
word_20 *dat, int s));
extern void address_to_register __ProtoType__((word_20 dat,
unsigned char *reg, int s));
extern void add_address __ProtoType__((word_20 *dat, int add));
extern char * make_hexstr __ProtoType__((long addr, int n));
extern void load_constant __ProtoType__((unsigned char *reg, int n,
long addr));
extern void load_address __ProtoType__((unsigned char *reg, long addr,
extern unsigned char get_register_nibble __ProtoType__((unsigned char *reg,
int n));
extern void store __ProtoType__((word_20 dat, unsigned char *reg,
int code));
extern void store_n __ProtoType__((word_20 dat, unsigned char *reg,
int n));
extern void recall __ProtoType__((unsigned char *reg, word_20 dat,
int code));
extern void recall_n __ProtoType__((unsigned char *reg, word_20 dat,
int n));
extern void register_to_address __ProtoType__((unsigned char *reg, word_20 *dat,
int s));
extern void address_to_register __ProtoType__((word_20 dat, unsigned char *reg,
int s));
extern void add_address __ProtoType__((word_20 * dat, int add));
extern char *make_hexstr __ProtoType__((long addr, int n));
extern void load_constant __ProtoType__((unsigned char *reg, int n, long addr));
extern void load_address __ProtoType__((unsigned char *reg, long addr, int n));
extern void store __ProtoType__((word_20 dat, unsigned char *reg, int code));
extern void store_n __ProtoType__((word_20 dat, unsigned char *reg, int n));
extern void recall __ProtoType__((unsigned char *reg, word_20 dat, int code));
extern void recall_n __ProtoType__((unsigned char *reg, word_20 dat, int n));
extern long dat_to_addr __ProtoType__((unsigned char *dat));
extern void addr_to_dat __ProtoType__((long addr, unsigned char *dat));
@ -139,10 +133,10 @@ extern void do_shutdown __ProtoType__((void));
extern int get_identification __ProtoType__((void));
extern void add_p_plus_one __ProtoType__((unsigned char *r));
extern void add_register_constant __ProtoType__((unsigned char *res,
int code, int val));
extern void sub_register_constant __ProtoType__((unsigned char *res,
int code, int val));
extern void add_register_constant __ProtoType__((unsigned char *res, int code,
int val));
extern void sub_register_constant __ProtoType__((unsigned char *res, int code,
int val));
extern void add_register __ProtoType__((unsigned char *res, unsigned char *r1,
unsigned char *r2, int code));
extern void sub_register __ProtoType__((unsigned char *res, unsigned char *r1,
@ -158,44 +152,34 @@ extern void and_register __ProtoType__((unsigned char *res, unsigned char *r1,
unsigned char *r2, int code));
extern void copy_register __ProtoType__((unsigned char *to, unsigned char *from,
int code));
extern void exchange_register __ProtoType__((unsigned char *r1, unsigned char *r2,
int code));
extern void exchange_register __ProtoType__((unsigned char *r1,
unsigned char *r2, int code));
extern void exchange_reg __ProtoType__((unsigned char *r, word_20 *d, int code));
extern void exchange_reg __ProtoType__((unsigned char *r, word_20 *d,
int code));
extern void shift_left_register __ProtoType__((unsigned char *r, int code));
extern void shift_left_circ_register __ProtoType__((unsigned char *r, int code));
extern void shift_left_circ_register __ProtoType__((unsigned char *r,
int code));
extern void shift_right_register __ProtoType__((unsigned char *r, int code));
extern void shift_right_circ_register __ProtoType__((unsigned char *r, int code));
extern void shift_right_bit_register __ProtoType__((unsigned char *r, int code));
extern int is_zero_register __ProtoType__((
unsigned char *r,
extern void shift_right_circ_register __ProtoType__((unsigned char *r,
int code));
extern int is_not_zero_register __ProtoType__((
unsigned char *r,
extern void shift_right_bit_register __ProtoType__((unsigned char *r,
int code));
extern int is_equal_register __ProtoType__((
unsigned char *r1,
extern int is_zero_register __ProtoType__((unsigned char *r, int code));
extern int is_not_zero_register __ProtoType__((unsigned char *r, int code));
extern int is_equal_register __ProtoType__((unsigned char *r1,
unsigned char *r2, int code));
extern int is_not_equal_register __ProtoType__((unsigned char *r1,
unsigned char *r2, int code));
extern int is_less_register __ProtoType__((unsigned char *r1, unsigned char *r2,
int code));
extern int is_less_or_equal_register __ProtoType__((unsigned char *r1,
unsigned char *r2,
int code));
extern int is_not_equal_register __ProtoType__((
unsigned char *r1,
unsigned char *r2,
int code));
extern int is_less_register __ProtoType__((
unsigned char *r1,
unsigned char *r2,
int code));
extern int is_less_or_equal_register __ProtoType__((
unsigned char *r1,
unsigned char *r2,
int code));
extern int is_greater_register __ProtoType__((
unsigned char *r1,
unsigned char *r2,
int code));
extern int is_greater_or_equal_register __ProtoType__((
unsigned char *r1,
extern int is_greater_register __ProtoType__((unsigned char *r1,
unsigned char *r2, int code));
extern int is_greater_or_equal_register __ProtoType__((unsigned char *r1,
unsigned char *r2,
int code));

View file

@ -44,265 +44,71 @@ typedef struct trans_tbl_t {
#ifndef DEFINE_TRANS_TABLE
extern trans_tbl_t hp48_trans_tbl[256];
#else
trans_tbl_t hp48_trans_tbl[256] =
{
{ 0, "\\0" },
{ 1, "\\001" },
{ 2, "\\002" },
{ 3, "\\003" },
{ 4, "\\004" },
{ 5, "\\005" },
{ 6, "\\006" },
{ 7, "\\007" },
{ 8, "\\b" },
{ 9, "\\t" },
{ 10, "\\n" },
{ 11, "\\011" },
{ 12, "\\f" },
{ 13, "\\r" },
{ 14, "\\014" },
{ 15, "\\015" },
{ 16, "\\016" },
{ 17, "\\017" },
{ 18, "\\018" },
{ 19, "\\019" },
{ 20, "\\020" },
{ 21, "\\021" },
{ 22, "\\022" },
{ 23, "\\023" },
{ 24, "\\024" },
{ 25, "\\025" },
{ 26, "\\026" },
{ 27, "\\027" },
{ 28, "\\028" },
{ 29, "\\029" },
{ 30, "\\030" },
{ 31, "\\031" },
{ ' ', 0 },
{ '!', 0 },
{ '"', 0 },
{ '#', 0 },
{ '$', 0 },
{ '%', 0 },
{ '&', 0 },
{ '\'', 0 },
{ '(', 0 },
{ ')', 0 },
{ '*', 0 },
{ '+', 0 },
{ ',', 0 },
{ '-', 0 },
{ '.', 0 },
{ '/', 0 },
{ '0', 0 },
{ '1', 0 },
{ '2', 0 },
{ '3', 0 },
{ '4', 0 },
{ '5', 0 },
{ '6', 0 },
{ '7', 0 },
{ '8', 0 },
{ '9', 0 },
{ ':', 0 },
{ ';', 0 },
{ '<', 0 },
{ '=', 0 },
{ '>', 0 },
{ '?', 0 },
{ '@', 0 },
{ 'A', 0 },
{ 'B', 0 },
{ 'C', 0 },
{ 'D', 0 },
{ 'E', 0 },
{ 'F', 0 },
{ 'G', 0 },
{ 'H', 0 },
{ 'I', 0 },
{ 'J', 0 },
{ 'K', 0 },
{ 'L', 0 },
{ 'M', 0 },
{ 'N', 0 },
{ 'O', 0 },
{ 'P', 0 },
{ 'Q', 0 },
{ 'R', 0 },
{ 'S', 0 },
{ 'T', 0 },
{ 'U', 0 },
{ 'V', 0 },
{ 'W', 0 },
{ 'X', 0 },
{ 'Y', 0 },
{ 'Z', 0 },
{ '[', 0 },
{ '\\', 0 },
{ ']', 0 },
{ '^', 0 },
{ '_', 0 },
{ '`', 0 },
{ 'a', 0 },
{ 'b', 0 },
{ 'c', 0 },
{ 'd', 0 },
{ 'e', 0 },
{ 'f', 0 },
{ 'g', 0 },
{ 'h', 0 },
{ 'i', 0 },
{ 'j', 0 },
{ 'k', 0 },
{ 'l', 0 },
{ 'm', 0 },
{ 'n', 0 },
{ 'o', 0 },
{ 'p', 0 },
{ 'q', 0 },
{ 'r', 0 },
{ 's', 0 },
{ 't', 0 },
{ 'u', 0 },
{ 'v', 0 },
{ 'w', 0 },
{ 'x', 0 },
{ 'y', 0 },
{ 'z', 0 },
{ '{', 0 },
{ '|', 0 },
{ '}', 0 },
{ '~', 0 },
{ 127, "\\127" },
{ 128, "\\<)" },
{ 129, "\\x-" },
{ 130, "\\.V" },
{ 131, "\\v/" },
{ 132, "\\.S" },
{ 133, "\\GS" },
{ 134, "\\|>" },
{ 135, "\\pi" },
{ 136, "\\.d" },
{ 137, "\\<=" },
{ 138, "\\>=" },
{ 139, "\\=/" },
{ 140, "\\Ga" },
{ 141, "\\->" },
{ 142, "\\<-" },
{ 143, "\\|v" },
{ 144, "\\|^" },
{ 145, "\\Gg" },
{ 146, "\\Gd" },
{ 147, "\\Ge" },
{ 148, "\\Gn" },
{ 149, "\\Gh" },
{ 150, "\\Gl" },
{ 151, "\\Gr" },
{ 152, "\\Gs" },
{ 153, "\\Gt" },
{ 154, "\\Gw" },
{ 155, "\\GD" },
{ 156, "\\PI" },
{ 157, "\\GW" },
{ 158, "\\[]" },
{ 159, "\\oo" },
{ 160, "\\160" },
{ 161, "\\161" },
{ 162, "\\162" },
{ 163, "\\163" },
{ 164, "\\164" },
{ 165, "\\165" },
{ 166, "\\166" },
{ 167, "\\167" },
{ 168, "\\168" },
{ 169, "\\169" },
{ 170, "\\170" },
{ 171, "\\<<" },
{ 172, "\\172" },
{ 173, "\\173" },
{ 174, "\\174" },
{ 175, "\\175" },
{ 176, "\\^o" },
{ 177, "\\177" },
{ 178, "\\178" },
{ 179, "\\179" },
{ 180, "\\180" },
{ 181, "\\Gm" },
{ 182, "\\182" },
{ 183, "\\183" },
{ 184, "\\184" },
{ 185, "\\185" },
{ 186, "\\186" },
{ 187, "\\>>" },
{ 188, "\\188" },
{ 189, "\\189" },
{ 190, "\\190" },
{ 191, "\\191" },
{ 192, "\\192" },
{ 193, "\\193" },
{ 194, "\\194" },
{ 195, "\\195" },
{ 196, "\\196" },
{ 197, "\\197" },
{ 198, "\\198" },
{ 199, "\\199" },
{ 200, "\\200" },
{ 201, "\\201" },
{ 202, "\\202" },
{ 203, "\\203" },
{ 204, "\\204" },
{ 205, "\\205" },
{ 206, "\\206" },
{ 207, "\\207" },
{ 208, "\\208" },
{ 209, "\\209" },
{ 210, "\\210" },
{ 211, "\\211" },
{ 212, "\\212" },
{ 213, "\\213" },
{ 214, "\\214" },
{ 215, "\\.x" },
{ 216, "\\O/" },
{ 217, "\\217" },
{ 218, "\\218" },
{ 219, "\\219" },
{ 220, "\\220" },
{ 221, "\\221" },
{ 222, "\\222" },
{ 223, "\\223" },
{ 224, "\\224" },
{ 225, "\\225" },
{ 226, "\\226" },
{ 227, "\\227" },
{ 228, "\\228" },
{ 229, "\\229" },
{ 230, "\\230" },
{ 231, "\\231" },
{ 232, "\\232" },
{ 233, "\\233" },
{ 234, "\\234" },
{ 235, "\\235" },
{ 236, "\\236" },
{ 237, "\\237" },
{ 238, "\\238" },
{ 239, "\\239" },
{ 240, "\\240" },
{ 241, "\\241" },
{ 242, "\\242" },
{ 243, "\\243" },
{ 244, "\\244" },
{ 245, "\\245" },
{ 246, "\\246" },
{ 247, "\\:-" },
{ 248, "\\248" },
{ 249, "\\249" },
{ 250, "\\250" },
{ 251, "\\251" },
{ 252, "\\252" },
{ 253, "\\253" },
{ 254, "\\254" },
{ 255, "\\255" }
};
trans_tbl_t hp48_trans_tbl[256] = {
{0, "\\0"}, {1, "\\001"}, {2, "\\002"}, {3, "\\003"},
{4, "\\004"}, {5, "\\005"}, {6, "\\006"}, {7, "\\007"},
{8, "\\b"}, {9, "\\t"}, {10, "\\n"}, {11, "\\011"},
{12, "\\f"}, {13, "\\r"}, {14, "\\014"}, {15, "\\015"},
{16, "\\016"}, {17, "\\017"}, {18, "\\018"}, {19, "\\019"},
{20, "\\020"}, {21, "\\021"}, {22, "\\022"}, {23, "\\023"},
{24, "\\024"}, {25, "\\025"}, {26, "\\026"}, {27, "\\027"},
{28, "\\028"}, {29, "\\029"}, {30, "\\030"}, {31, "\\031"},
{' ', 0}, {'!', 0}, {'"', 0}, {'#', 0},
{'$', 0}, {'%', 0}, {'&', 0}, {'\'', 0},
{'(', 0}, {')', 0}, {'*', 0}, {'+', 0},
{',', 0}, {'-', 0}, {'.', 0}, {'/', 0},
{'0', 0}, {'1', 0}, {'2', 0}, {'3', 0},
{'4', 0}, {'5', 0}, {'6', 0}, {'7', 0},
{'8', 0}, {'9', 0}, {':', 0}, {';', 0},
{'<', 0}, {'=', 0}, {'>', 0}, {'?', 0},
{'@', 0}, {'A', 0}, {'B', 0}, {'C', 0},
{'D', 0}, {'E', 0}, {'F', 0}, {'G', 0},
{'H', 0}, {'I', 0}, {'J', 0}, {'K', 0},
{'L', 0}, {'M', 0}, {'N', 0}, {'O', 0},
{'P', 0}, {'Q', 0}, {'R', 0}, {'S', 0},
{'T', 0}, {'U', 0}, {'V', 0}, {'W', 0},
{'X', 0}, {'Y', 0}, {'Z', 0}, {'[', 0},
{'\\', 0}, {']', 0}, {'^', 0}, {'_', 0},
{'`', 0}, {'a', 0}, {'b', 0}, {'c', 0},
{'d', 0}, {'e', 0}, {'f', 0}, {'g', 0},
{'h', 0}, {'i', 0}, {'j', 0}, {'k', 0},
{'l', 0}, {'m', 0}, {'n', 0}, {'o', 0},
{'p', 0}, {'q', 0}, {'r', 0}, {'s', 0},
{'t', 0}, {'u', 0}, {'v', 0}, {'w', 0},
{'x', 0}, {'y', 0}, {'z', 0}, {'{', 0},
{'|', 0}, {'}', 0}, {'~', 0}, {127, "\\127"},
{128, "\\<)"}, {129, "\\x-"}, {130, "\\.V"}, {131, "\\v/"},
{132, "\\.S"}, {133, "\\GS"}, {134, "\\|>"}, {135, "\\pi"},
{136, "\\.d"}, {137, "\\<="}, {138, "\\>="}, {139, "\\=/"},
{140, "\\Ga"}, {141, "\\->"}, {142, "\\<-"}, {143, "\\|v"},
{144, "\\|^"}, {145, "\\Gg"}, {146, "\\Gd"}, {147, "\\Ge"},
{148, "\\Gn"}, {149, "\\Gh"}, {150, "\\Gl"}, {151, "\\Gr"},
{152, "\\Gs"}, {153, "\\Gt"}, {154, "\\Gw"}, {155, "\\GD"},
{156, "\\PI"}, {157, "\\GW"}, {158, "\\[]"}, {159, "\\oo"},
{160, "\\160"}, {161, "\\161"}, {162, "\\162"}, {163, "\\163"},
{164, "\\164"}, {165, "\\165"}, {166, "\\166"}, {167, "\\167"},
{168, "\\168"}, {169, "\\169"}, {170, "\\170"}, {171, "\\<<"},
{172, "\\172"}, {173, "\\173"}, {174, "\\174"}, {175, "\\175"},
{176, "\\^o"}, {177, "\\177"}, {178, "\\178"}, {179, "\\179"},
{180, "\\180"}, {181, "\\Gm"}, {182, "\\182"}, {183, "\\183"},
{184, "\\184"}, {185, "\\185"}, {186, "\\186"}, {187, "\\>>"},
{188, "\\188"}, {189, "\\189"}, {190, "\\190"}, {191, "\\191"},
{192, "\\192"}, {193, "\\193"}, {194, "\\194"}, {195, "\\195"},
{196, "\\196"}, {197, "\\197"}, {198, "\\198"}, {199, "\\199"},
{200, "\\200"}, {201, "\\201"}, {202, "\\202"}, {203, "\\203"},
{204, "\\204"}, {205, "\\205"}, {206, "\\206"}, {207, "\\207"},
{208, "\\208"}, {209, "\\209"}, {210, "\\210"}, {211, "\\211"},
{212, "\\212"}, {213, "\\213"}, {214, "\\214"}, {215, "\\.x"},
{216, "\\O/"}, {217, "\\217"}, {218, "\\218"}, {219, "\\219"},
{220, "\\220"}, {221, "\\221"}, {222, "\\222"}, {223, "\\223"},
{224, "\\224"}, {225, "\\225"}, {226, "\\226"}, {227, "\\227"},
{228, "\\228"}, {229, "\\229"}, {230, "\\230"}, {231, "\\231"},
{232, "\\232"}, {233, "\\233"}, {234, "\\234"}, {235, "\\235"},
{236, "\\236"}, {237, "\\237"}, {238, "\\238"}, {239, "\\239"},
{240, "\\240"}, {241, "\\241"}, {242, "\\242"}, {243, "\\243"},
{244, "\\244"}, {245, "\\245"}, {246, "\\246"}, {247, "\\:-"},
{248, "\\248"}, {249, "\\249"}, {250, "\\250"}, {251, "\\251"},
{252, "\\252"}, {253, "\\253"}, {254, "\\254"}, {255, "\\255"}};
#endif /* DEFINE_TRANS_TABLE */
#endif /* !_HP48CHAR_H */

File diff suppressed because it is too large Load diff

122
src/lcd.c
View file

@ -60,23 +60,22 @@
* $Id: lcd.c,v 1.13 1995/01/11 18:20:01 ecd Exp ecd $
*/
#include "global.h"
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
#ifdef SUNOS
#include <memory.h>
#endif
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "annunc.h"
#include "device.h"
#include "hp48.h"
#include "hp48_emu.h"
#include "x48_x11.h"
#include "annunc.h"
#include "device.h"
static int last_annunc_state = -1;
@ -91,24 +90,23 @@ unsigned char lcd_buffer[DISP_ROWS][NIBS_PER_BUFFER_ROW];
Pixmap nibble_maps[16];
unsigned char nibbles[16][2] =
{
{ 0x00, 0x00 }, /* ---- */
{ 0x03, 0x03 }, /* *--- */
{ 0x0c, 0x0c }, /* -*-- */
{ 0x0f, 0x0f }, /* **-- */
{ 0x30, 0x30 }, /* --*- */
{ 0x33, 0x33 }, /* *-*- */
{ 0x3c, 0x3c }, /* -**- */
{ 0x3f, 0x3f }, /* ***- */
{ 0xc0, 0xc0 }, /* ---* */
{ 0xc3, 0xc3 }, /* *--* */
{ 0xcc, 0xcc }, /* -*-* */
{ 0xcf, 0xcf }, /* **-* */
{ 0xf0, 0xf0 }, /* --** */
{ 0xf3, 0xf3 }, /* *-** */
{ 0xfc, 0xfc }, /* -*** */
{ 0xff, 0xff } /* **** */
unsigned char nibbles[16][2] = {
{0x00, 0x00}, /* ---- */
{0x03, 0x03}, /* *--- */
{0x0c, 0x0c}, /* -*-- */
{0x0f, 0x0f}, /* **-- */
{0x30, 0x30}, /* --*- */
{0x33, 0x33}, /* *-*- */
{0x3c, 0x3c}, /* -**- */
{0x3f, 0x3f}, /* ***- */
{0xc0, 0xc0}, /* ---* */
{0xc3, 0xc3}, /* *--* */
{0xcc, 0xcc}, /* -*-* */
{0xcf, 0xcf}, /* **-* */
{0xf0, 0xf0}, /* --** */
{0xf3, 0xf3}, /* *-** */
{0xfc, 0xfc}, /* -*** */
{0xff, 0xff} /* **** */
};
static unsigned char nibble_bits[16];
@ -117,8 +115,8 @@ void init_nibble_maps(void) {
int i;
for (i = 0; i < 16; i++) {
nibble_maps[i] = XCreateBitmapFromData(dpy, disp.win,
(char *)nibbles[i], 8, 2);
nibble_maps[i] =
XCreateBitmapFromData(dpy, disp.win, (char *)nibbles[i], 8, 2);
}
#ifdef HAVE_XSHM
if (shm_flag) {
@ -176,12 +174,12 @@ void init_display(void) {
disp.lines = 110;
if (display.offset > 3)
display.nibs_per_line = (NIBBLES_PER_ROW+saturn.line_offset+2) & 0xfff;
display.nibs_per_line = (NIBBLES_PER_ROW + saturn.line_offset + 2) & 0xfff;
else
display.nibs_per_line = (NIBBLES_PER_ROW+saturn.line_offset) & 0xfff;
display.nibs_per_line = (NIBBLES_PER_ROW + saturn.line_offset) & 0xfff;
display.disp_end = display.disp_start +
(display.nibs_per_line * (display.lines + 1));
display.disp_end =
display.disp_start + (display.nibs_per_line * (display.lines + 1));
display.menu_start = saturn.menu_addr;
display.menu_end = saturn.menu_addr + 0x110;
@ -238,8 +236,7 @@ void update_display(void) {
word_20 data_addr, data_addr_2;
#endif
if (!disp.mapped)
{
if (!disp.mapped) {
refresh_icon();
return;
}
@ -269,9 +266,9 @@ void update_display(void) {
#endif
if (display.offset != old_offset) {
memset(disp_buf, 0xf0,
(size_t)((display.lines+1) * NIBS_PER_BUFFER_ROW));
(size_t)((display.lines + 1) * NIBS_PER_BUFFER_ROW));
memset(lcd_buffer, 0xf0,
(size_t)((display.lines+1) * NIBS_PER_BUFFER_ROW));
(size_t)((display.lines + 1) * NIBS_PER_BUFFER_ROW));
old_offset = display.offset;
}
if (display.lines != old_lines) {
@ -316,9 +313,11 @@ void update_display(void) {
} else {
#ifdef HAVE_XSHM
if (shm_flag) {
memset(disp.disp_image->data, 0,
memset(
disp.disp_image->data, 0,
(size_t)(disp.disp_image->bytes_per_line * disp.disp_image->height));
memset(disp.menu_image->data, 0,
memset(
disp.menu_image->data, 0,
(size_t)(disp.menu_image->bytes_per_line * disp.menu_image->height));
disp.display_update = UPDATE_DISP | UPDATE_MENU;
} else {
@ -361,7 +360,7 @@ void disp_draw_nibble(word_20 addr, word_4 val) {
if (shm_flag) {
shm_addr = (2 * y * disp.disp_image->bytes_per_line) + x;
disp.disp_image->data[shm_addr] = nibble_bits[val];
disp.disp_image->data[shm_addr+disp.disp_image->bytes_per_line] =
disp.disp_image->data[shm_addr + disp.disp_image->bytes_per_line] =
nibble_bits[val];
disp.display_update |= UPDATE_DISP;
} else {
@ -380,8 +379,7 @@ void disp_draw_nibble(word_20 addr, word_4 val) {
for (y = 0; y < display.lines; y++) {
disp.disp_image->data[shm_addr] = nibble_bits[val];
shm_addr += disp.disp_image->bytes_per_line;
disp.disp_image->data[shm_addr]
= nibble_bits[val];
disp.disp_image->data[shm_addr] = nibble_bits[val];
shm_addr += disp.disp_image->bytes_per_line;
}
disp.display_update |= UPDATE_DISP;
@ -409,10 +407,11 @@ void menu_draw_nibble(word_20 addr, word_4 val) {
offset = (addr - display.menu_start);
#ifdef HAVE_XSHM
if (shm_flag) {
shm_addr = 2 * (offset / NIBBLES_PER_ROW) * disp.menu_image->bytes_per_line
+ (offset % NIBBLES_PER_ROW);
shm_addr =
2 * (offset / NIBBLES_PER_ROW) * disp.menu_image->bytes_per_line +
(offset % NIBBLES_PER_ROW);
disp.menu_image->data[shm_addr] = nibble_bits[val];
disp.menu_image->data[shm_addr+disp.menu_image->bytes_per_line] =
disp.menu_image->data[shm_addr + disp.menu_image->bytes_per_line] =
nibble_bits[val];
disp.display_update |= UPDATE_MENU;
} else {
@ -428,7 +427,6 @@ void menu_draw_nibble(word_20 addr, word_4 val) {
#endif
}
struct ann_struct {
int bit;
int x;
@ -438,15 +436,14 @@ struct ann_struct {
unsigned char *bits;
Pixmap pixmap;
} ann_tbl[] = {
{ ANN_LEFT, 16, 4, ann_left_width, ann_left_height, ann_left_bits },
{ ANN_RIGHT, 61, 4, ann_right_width, ann_right_height, ann_right_bits },
{ ANN_ALPHA, 106, 4, ann_alpha_width, ann_alpha_height, ann_alpha_bits },
{ ANN_BATTERY, 151, 4, ann_battery_width, ann_battery_height,
ann_battery_bits },
{ ANN_BUSY, 196, 4, ann_busy_width, ann_busy_height, ann_busy_bits },
{ ANN_IO, 241, 4, ann_io_width, ann_io_height, ann_io_bits },
{ 0 }
};
{ANN_LEFT, 16, 4, ann_left_width, ann_left_height, ann_left_bits},
{ANN_RIGHT, 61, 4, ann_right_width, ann_right_height, ann_right_bits},
{ANN_ALPHA, 106, 4, ann_alpha_width, ann_alpha_height, ann_alpha_bits},
{ANN_BATTERY, 151, 4, ann_battery_width, ann_battery_height,
ann_battery_bits},
{ANN_BUSY, 196, 4, ann_busy_width, ann_busy_height, ann_busy_bits},
{ANN_IO, 241, 4, ann_io_width, ann_io_height, ann_io_bits},
{0}};
void draw_annunc(void) {
int val;
@ -457,18 +454,14 @@ void draw_annunc(void) {
if (val == last_annunc_state)
return;
last_annunc_state = val;
for (i = 0; ann_tbl[i].bit; i++)
{
if ((ann_tbl[i].bit & val) == ann_tbl[i].bit)
{
for (i = 0; ann_tbl[i].bit; i++) {
if ((ann_tbl[i].bit & val) == ann_tbl[i].bit) {
XCopyPlane(dpy, ann_tbl[i].pixmap, disp.win, disp.gc, 0, 0,
ann_tbl[i].width, ann_tbl[i].height,
ann_tbl[i].x, ann_tbl[i].y, 1);
}
else
{
XClearArea(dpy, disp.win, ann_tbl[i].x, ann_tbl[i].y,
ann_tbl[i].width, ann_tbl[i].height, False);
ann_tbl[i].width, ann_tbl[i].height, ann_tbl[i].x,
ann_tbl[i].y, 1);
} else {
XClearArea(dpy, disp.win, ann_tbl[i].x, ann_tbl[i].y, ann_tbl[i].width,
ann_tbl[i].height, False);
}
}
refresh_icon();
@ -483,9 +476,8 @@ void init_annunc(void) {
int i;
for (i = 0; ann_tbl[i].bit; i++) {
ann_tbl[i].pixmap = XCreateBitmapFromData(dpy, disp.win,
(char *)ann_tbl[i].bits,
ann_tbl[i].width,
ann_tbl[i].height);
ann_tbl[i].pixmap =
XCreateBitmapFromData(dpy, disp.win, (char *)ann_tbl[i].bits,
ann_tbl[i].width, ann_tbl[i].height);
}
}

View file

@ -57,19 +57,18 @@
* $Id: main.c,v 1.11 1995/01/11 18:20:01 ecd Exp ecd $
*/
#include <errno.h>
#include <fcntl.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
#include <sys/time.h>
#include <fcntl.h>
#include <unistd.h>
#include "x48_x11.h"
#include "hp48.h"
#include "debugger.h"
#include "hp48.h"
#include "x48_x11.h"
#include <langinfo.h>
#include <locale.h>
@ -93,7 +92,7 @@ void signal_handler(int sig) {
break;
case SIGPIPE:
exit_x48(0);
exit (0);
exit(0);
default:
break;
}
@ -104,21 +103,17 @@ void save_options(int argc, char **argv) {
saved_argc = argc;
saved_argv = (char **)malloc((argc + 2) * sizeof(char *));
if (saved_argv == (char **)0)
{
if (saved_argv == (char **)0) {
fprintf(stderr, "%s: malloc failed in save_options(), exit\n", progname);
exit (1);
exit(1);
}
saved_argv[argc] = (char *)0;
while (argc--)
{
while (argc--) {
l = strlen(argv[argc]) + 1;
saved_argv[argc] = (char *)malloc(l);
if (saved_argv[argc] == (char *)0)
{
fprintf(stderr, "%s: malloc failed in save_options(), exit\n",
progname);
exit (1);
if (saved_argv[argc] == (char *)0) {
fprintf(stderr, "%s: malloc failed in save_options(), exit\n", progname);
exit(1);
}
memcpy(saved_argv[argc], argv[argc], l);
}
@ -152,7 +147,7 @@ int main(int argc, char **argv) {
* Open up the display
*/
if (InitDisplay(argc, argv) < 0) {
exit (1);
exit(1);
}
/*
@ -165,7 +160,7 @@ int main(int argc, char **argv) {
*/
if (CreateWindows(saved_argc, saved_argv) < 0) {
fprintf(stderr, "%s: can\'t create window\n", progname);
exit (1);
exit(1);
}
/*
@ -229,9 +224,9 @@ int main(int argc, char **argv) {
do {
if (!exec_flags)
emulate ();
emulate();
else
emulate_debug ();
emulate_debug();
debug();

File diff suppressed because it is too large Load diff

View file

@ -25,13 +25,12 @@
* $Id: mkcard.c,v 1.1 1995/01/11 18:11:25 ecd Exp ecd $
*/
#include "global.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
#ifdef SUNOS
#include <memory.h>
#endif
@ -42,14 +41,12 @@ unsigned char *mem;
int write_mem_file(char *name, unsigned char *mem, int size) {
FILE *fp;
if (NULL == (fp = fopen(name, "w")))
{
if (NULL == (fp = fopen(name, "w"))) {
fprintf(stderr, "can\'t open %s\n", name);
return 0;
}
if (fwrite(mem, 1, (size_t)size, fp) != size)
{
if (fwrite(mem, 1, (size_t)size, fp) != size) {
fprintf(stderr, "can\'t write %s\n", name);
fclose(fp);
return 0;
@ -65,11 +62,10 @@ int main(int argc, char **argv) {
char *asize;
unsigned char *core;
if (argc < 2)
{
if (argc < 2) {
fprintf(stderr, "usage: %s [32K | 128K | 1M | 2M | 4M] file-name\n",
argv[0]);
exit (1);
exit(1);
}
name = argv[2];
@ -88,25 +84,23 @@ int main(int argc, char **argv) {
size = 0x200000;
else if (!strcmp(asize, "4M"))
size = 0x400000;
else
{
else {
fprintf(stderr,
"%s: size must be one of 32K, 128K, 256K, 512K, 1M, 2M, or 4M\n",
argv[0]);
exit (1);
exit(1);
}
if ((core = (unsigned char *)malloc(size)) == NULL) {
fprintf(stderr, "%s: can\'t malloc %ld bytes\n", argv[0], size);
exit (1);
exit(1);
}
memset(core, 0, size);
if (!write_mem_file(name, core, size))
{
if (!write_mem_file(name, core, size)) {
fprintf(stderr, "%s: can\'t write to %s\n", argv[0], name);
exit (1);
exit(1);
}
exit (0);
exit(0);
}

View file

@ -27,7 +27,6 @@
#ifndef _MMU_H
#define _MMU_H 1
#define NR_MCTL 6
#define MCTL_MMIO_SX 0
@ -44,7 +43,6 @@
#define MCTL_PORT2_GX 4
#define MCTL_SysROM_GX 5
#if 0
extern void init_mmu __ProtoType__((void));
extern void reset_mmu __ProtoType__((void));

View file

@ -44,8 +44,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
#include "constants.h"
#include "resources.h"
@ -90,18 +90,19 @@ where options include:\n\
-xrm <resource> set Xresource <resource>\n\
-/+throttle turn off/on speed emulation\n\
-/+netbook turn off/on netbook layout\n\
\n", VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL, progname);
\n",
VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL, progname);
fflush(stdout);
exit (1);
exit(1);
}
void show_version(void) {
fprintf(stdout, "\n\
%s Version %d.%d.%d, x48 is Copyright (c) 1994-2005 by Eddie C. Dost <ecd@dressler.de>.\n\
Compiled on %s by <%s> #%d\n\n",
progname, VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
COMPILE_TIME, COMPILE_BY, COMPILE_VERSION);
progname, VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL, COMPILE_TIME,
COMPILE_BY, COMPILE_VERSION);
}
void show_copyright(void) {

View file

@ -49,72 +49,72 @@
#include <X11/Xresource.h>
static XrmOptionDescRec options[] = {
{ "-display", ".display", XrmoptionSepArg, (void *) 0 },
{ "-geometry", "*geometry", XrmoptionSepArg, (void *) 0 },
{ "-iconGeom", "*iconGeom", XrmoptionSepArg, (void *) 0 },
{ "-iconName", "*iconName", XrmoptionSepArg, (void *) 0 },
{ "-iconic", "*iconic", XrmoptionNoArg, (void *) "True" },
{ "-name", (char *) 0, XrmoptionSepArg, (void *) 0 },
{ "-title", "*title", XrmoptionSepArg, (void *) 0 },
{"-display", ".display", XrmoptionSepArg, (void *)0},
{"-geometry", "*geometry", XrmoptionSepArg, (void *)0},
{"-iconGeom", "*iconGeom", XrmoptionSepArg, (void *)0},
{"-iconName", "*iconName", XrmoptionSepArg, (void *)0},
{"-iconic", "*iconic", XrmoptionNoArg, (void *)"True"},
{"-name", (char *)0, XrmoptionSepArg, (void *)0},
{"-title", "*title", XrmoptionSepArg, (void *)0},
{ "-xshm", "*useXShm", XrmoptionNoArg, (void *) "True" },
{ "+xshm", "*useXShm", XrmoptionNoArg, (void *)"False" },
{"-xshm", "*useXShm", XrmoptionNoArg, (void *)"True"},
{"+xshm", "*useXShm", XrmoptionNoArg, (void *)"False"},
{ "-visual", "*visual", XrmoptionSepArg, (void *) 0 },
{ "-mono", "*mono", XrmoptionNoArg, (void *) "True" },
{ "-gray", "*gray", XrmoptionNoArg, (void *) "True" },
{ "-monoIcon", "*monoIcon", XrmoptionNoArg, (void *) "True" },
{"-visual", "*visual", XrmoptionSepArg, (void *)0},
{"-mono", "*mono", XrmoptionNoArg, (void *)"True"},
{"-gray", "*gray", XrmoptionNoArg, (void *)"True"},
{"-monoIcon", "*monoIcon", XrmoptionNoArg, (void *)"True"},
{ "-version", "*printVersion", XrmoptionNoArg, (void *) "True" },
{ "-copyright", "*printCopyright",XrmoptionNoArg, (void *) "True" },
{ "-warranty", "*printWarranty", XrmoptionNoArg, (void *) "True" },
{"-version", "*printVersion", XrmoptionNoArg, (void *)"True"},
{"-copyright", "*printCopyright", XrmoptionNoArg, (void *)"True"},
{"-warranty", "*printWarranty", XrmoptionNoArg, (void *)"True"},
{ "-smallFont", "*smallLabelFont",XrmoptionSepArg, (void *) 0 },
{ "-mediumFont", "*mediumLabelFont",XrmoptionSepArg, (void *) 0 },
{ "-largeFont", "*largeLabelFont",XrmoptionSepArg, (void *) 0 },
{ "-connFont", "*connectionFont",XrmoptionSepArg, (void *) 0 },
{"-smallFont", "*smallLabelFont", XrmoptionSepArg, (void *)0},
{"-mediumFont", "*mediumLabelFont", XrmoptionSepArg, (void *)0},
{"-largeFont", "*largeLabelFont", XrmoptionSepArg, (void *)0},
{"-connFont", "*connectionFont", XrmoptionSepArg, (void *)0},
{ "-verbose", "*verbose", XrmoptionNoArg, (void *) "True" },
{ "-quiet", "*quiet", XrmoptionNoArg, (void *) "True" },
{"-verbose", "*verbose", XrmoptionNoArg, (void *)"True"},
{"-quiet", "*quiet", XrmoptionNoArg, (void *)"True"},
{ "-terminal", "*useTerminal", XrmoptionNoArg, (void *) "True" },
{ "+terminal", "*useTerminal", XrmoptionNoArg, (void *)"False" },
{ "-serial", "*useSerial", XrmoptionNoArg, (void *) "True" },
{ "+serial", "*useSerial", XrmoptionNoArg, (void *)"False" },
{ "-line", "*serialLine", XrmoptionSepArg, (void *) 0 },
{"-terminal", "*useTerminal", XrmoptionNoArg, (void *)"True"},
{"+terminal", "*useTerminal", XrmoptionNoArg, (void *)"False"},
{"-serial", "*useSerial", XrmoptionNoArg, (void *)"True"},
{"+serial", "*useSerial", XrmoptionNoArg, (void *)"False"},
{"-line", "*serialLine", XrmoptionSepArg, (void *)0},
{ "-initialize", "*completeInitialize",XrmoptionNoArg,(void *) "True" },
{ "-reset", "*resetOnStartup",XrmoptionNoArg, (void *) "True" },
{ "-rom", "*romFileName", XrmoptionSepArg, (void *) 0 },
{ "-home", "*homeDirectory", XrmoptionSepArg, (void *) 0 },
{"-initialize", "*completeInitialize", XrmoptionNoArg, (void *)"True"},
{"-reset", "*resetOnStartup", XrmoptionNoArg, (void *)"True"},
{"-rom", "*romFileName", XrmoptionSepArg, (void *)0},
{"-home", "*homeDirectory", XrmoptionSepArg, (void *)0},
{ "-debug", "*useDebugger", XrmoptionNoArg, (void *)"False" },
{ "+debug", "*useDebugger", XrmoptionNoArg, (void *) "True" },
{ "-disasm", "*disassemblerMnemonics",XrmoptionSepArg,(void *) 0 },
{"-debug", "*useDebugger", XrmoptionNoArg, (void *)"False"},
{"+debug", "*useDebugger", XrmoptionNoArg, (void *)"True"},
{"-disasm", "*disassemblerMnemonics", XrmoptionSepArg, (void *)0},
{ "-xrm", (char *) 0, XrmoptionResArg, (void *) 0 },
{ "-netbook", "*netbook", XrmoptionNoArg, (void *)"False" },
{ "+netbook", "*netbook", XrmoptionNoArg, (void *) "True" },
{"-xrm", (char *)0, XrmoptionResArg, (void *)0},
{"-netbook", "*netbook", XrmoptionNoArg, (void *)"False"},
{"+netbook", "*netbook", XrmoptionNoArg, (void *)"True"},
{ "-throttle", "*throttle", XrmoptionNoArg, (void *)"False" },
{ "+throttle", "*throttle", XrmoptionNoArg, (void *) "True" },
{"-throttle", "*throttle", XrmoptionNoArg, (void *)"False"},
{"+throttle", "*throttle", XrmoptionNoArg, (void *)"True"},
/*
* these are parsed for compatibility, but not used yet.
*/
{ "-bg", "*background", XrmoptionSepArg, (void *) 0 },
{ "-background", "*background", XrmoptionSepArg, (void *) 0 },
{ "-bd", "*borderColor", XrmoptionSepArg, (void *) 0 },
{ "-bordercolor", "*borderColor", XrmoptionSepArg, (void *) 0 },
{ "-bw", "*borderWidth", XrmoptionSepArg, (void *) 0 },
{ "-borderwidth", "*borderWidth", XrmoptionSepArg, (void *) 0 },
{ "-fg", "*foreground", XrmoptionSepArg, (void *) 0 },
{ "-foreground", "*foreground", XrmoptionSepArg, (void *) 0 },
{ "-fn", "*fontName", XrmoptionSepArg, (void *) 0 },
{ "-font", "*fontName", XrmoptionSepArg, (void *) 0 },
{ "-rv", "*reverseVideo", XrmoptionNoArg, (void *) "True" },
{ "+rv", "*reverseVideo", XrmoptionNoArg, (void *)"False" },
{ "-reverse", "*reverseVideo", XrmoptionNoArg, (void *) "True" },
{"-bg", "*background", XrmoptionSepArg, (void *)0},
{"-background", "*background", XrmoptionSepArg, (void *)0},
{"-bd", "*borderColor", XrmoptionSepArg, (void *)0},
{"-bordercolor", "*borderColor", XrmoptionSepArg, (void *)0},
{"-bw", "*borderWidth", XrmoptionSepArg, (void *)0},
{"-borderwidth", "*borderWidth", XrmoptionSepArg, (void *)0},
{"-fg", "*foreground", XrmoptionSepArg, (void *)0},
{"-foreground", "*foreground", XrmoptionSepArg, (void *)0},
{"-fn", "*fontName", XrmoptionSepArg, (void *)0},
{"-font", "*fontName", XrmoptionSepArg, (void *)0},
{"-rv", "*reverseVideo", XrmoptionNoArg, (void *)"True"},
{"+rv", "*reverseVideo", XrmoptionNoArg, (void *)"False"},
{"-reverse", "*reverseVideo", XrmoptionNoArg, (void *)"True"},
};

View file

@ -42,28 +42,21 @@
* $Id: register.c,v 1.6 1995/01/11 18:20:01 ecd Exp ecd $
*/
#include "global.h"
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include "hp48.h"
#include "hp48_emu.h"
extern long nibble_masks[16];
static int start_fields[] = {
-1, 0, 2, 0, 15, 3, 0, 0,
-1, 0, 2, 0, 15, 3, 0, 0,
0, 0, 0
};
static int start_fields[] = {-1, 0, 2, 0, 15, 3, 0, 0, -1, 0,
2, 0, 15, 3, 0, 0, 0, 0, 0};
static int end_fields[] = {
-1, -1, 2, 2, 15, 14, 1, 15,
-1, -1, 2, 2, 15, 14, 1, 4,
3, 2, 0
};
static int end_fields[] = {-1, -1, 2, 2, 15, 14, 1, 15, -1, -1,
2, 2, 15, 14, 1, 4, 3, 2, 0};
static inline int get_start(int code) {
int s;
@ -83,8 +76,8 @@ static inline int get_end(int code) {
return e;
}
void add_register(unsigned char *res, unsigned char *r1,
unsigned char *r2, int code) {
void add_register(unsigned char *res, unsigned char *r1, unsigned char *r2,
int code) {
int t, c, i, s, e;
s = get_start(code);
@ -128,8 +121,8 @@ void add_p_plus_one(unsigned char *r) {
saturn.CARRY = 0;
}
void sub_register(unsigned char *res, unsigned char *r1,
unsigned char *r2, int code) {
void sub_register(unsigned char *res, unsigned char *r1, unsigned char *r2,
int code) {
int t, c, i, s, e;
s = get_start(code);
@ -288,8 +281,8 @@ void zero_register(unsigned char *r, int code) {
r[i] = 0;
}
void or_register(unsigned char *res, unsigned char *r1,
unsigned char *r2, int code) {
void or_register(unsigned char *res, unsigned char *r1, unsigned char *r2,
int code) {
int i, s, e;
s = get_start(code);
@ -299,8 +292,8 @@ void or_register(unsigned char *res, unsigned char *r1,
}
}
void and_register(unsigned char *res, unsigned char *r1,
unsigned char *r2, int code) {
void and_register(unsigned char *res, unsigned char *r1, unsigned char *r2,
int code) {
int i, s, e;
s = get_start(code);
@ -350,7 +343,7 @@ void shift_left_register(unsigned char *r, int code) {
s = get_start(code);
e = get_end(code);
for (i = e; i > s; i--) {
r[i] = r[i-1] & 0x0f;
r[i] = r[i - 1] & 0x0f;
}
r[s] = 0;
}
@ -362,7 +355,7 @@ void shift_left_circ_register(unsigned char *r, int code) {
e = get_end(code);
t = r[e] & 0x0f;
for (i = e; i > s; i--) {
r[i] = r[i-1] & 0x0f;
r[i] = r[i - 1] & 0x0f;
}
r[s] = t;
}
@ -375,7 +368,7 @@ void shift_right_register(unsigned char *r, int code) {
if (r[s] & 0x0f)
saturn.SB = 1;
for (i = s; i < e; i++) {
r[i] = r[i+1] & 0x0f;
r[i] = r[i + 1] & 0x0f;
}
r[e] = 0;
}
@ -387,7 +380,7 @@ void shift_right_circ_register(unsigned char *r, int code) {
e = get_end(code);
t = r[s] & 0x0f;
for (i = s; i < e; i++) {
r[i] = r[i+1] & 0x0f;
r[i] = r[i + 1] & 0x0f;
}
r[e] = t;
if (t)
@ -522,7 +515,8 @@ int is_greater_register(unsigned char *r1, unsigned char *r2, int code) {
return z;
}
int is_greater_or_equal_register(unsigned char *r1, unsigned char *r2, int code) {
int is_greater_or_equal_register(unsigned char *r1, unsigned char *r2,
int code) {
int z, i, s, e;
s = get_start(code);

View file

@ -50,14 +50,14 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xresource.h>
#include <X11/Xutil.h>
#include <stdio.h>
#include "resources.h"
#include "disasm.h"
#include "errors.h"
#include "resources.h"
XrmDatabase rdb = (XrmDatabase)0;
@ -92,136 +92,132 @@ void get_resources(void) {
useSerial = get_boolean_resource("useSerial", "UseSerial");
serialLine = get_string_resource("serialLine", "SerialLine");
initialize = get_boolean_resource("completeInitialize",
"CompleteInitialize");
resetOnStartup = get_boolean_resource("resetOnStartup",
"ResetOnStartup");
initialize = get_boolean_resource("completeInitialize", "CompleteInitialize");
resetOnStartup = get_boolean_resource("resetOnStartup", "ResetOnStartup");
romFileName = get_string_resource("romFileName", "RomFileName");
homeDirectory = get_string_resource("homeDirectory", "HomeDirectory");
useDebugger = get_boolean_resource("useDebugger", "UseDebugger");
disassembler_mode = get_mnemonic_resource("disassemblerMnemonics",
"DisassemblerMnemonics");
disassembler_mode =
get_mnemonic_resource("disassemblerMnemonics", "DisassemblerMnemonics");
netbook = get_boolean_resource("netbook", "Netbook");
throttle = get_boolean_resource("throttle", "Throttle");
}
char * get_string_resource_from_db (XrmDatabase db, char *name, char *class) {
char *get_string_resource_from_db(XrmDatabase db, char *name, char *class) {
XrmValue value;
char *type;
char full_name [1024], full_class [1024];
char full_name[1024], full_class[1024];
strcpy (full_name, res_name);
strcat (full_name, ".");
strcat (full_name, name);
strcpy (full_class, res_class);
strcat (full_class, ".");
strcat (full_class, class);
if (XrmGetResource (db, full_name, full_class, &type, &value))
{
char *str = (char *) malloc (value.size + 1);
strncpy (str, (char *) value.addr, value.size);
str [value.size] = 0;
strcpy(full_name, res_name);
strcat(full_name, ".");
strcat(full_name, name);
strcpy(full_class, res_class);
strcat(full_class, ".");
strcat(full_class, class);
if (XrmGetResource(db, full_name, full_class, &type, &value)) {
char *str = (char *)malloc(value.size + 1);
strncpy(str, (char *)value.addr, value.size);
str[value.size] = 0;
return str;
}
return (char *)0;
}
char * get_string_resource (char *name, char *class) {
char *get_string_resource(char *name, char *class) {
return get_string_resource_from_db(rdb, name, class);
}
int get_mnemonic_resource (char *name, char *class) {
char *tmp, buf [100];
char *s = get_string_resource (name, class);
int get_mnemonic_resource(char *name, char *class) {
char *tmp, buf[100];
char *s = get_string_resource(name, class);
char *os = s;
if (! s) return CLASS_MNEMONICS;
if (!s)
return CLASS_MNEMONICS;
for (tmp = buf; *s; s++)
*tmp++ = isupper (*s) ? _tolower (*s) : *s;
*tmp++ = isupper(*s) ? _tolower(*s) : *s;
*tmp = 0;
free (os);
free(os);
if (!strcmp (buf, "hp"))
if (!strcmp(buf, "hp"))
return HP_MNEMONICS;
if (!strcmp (buf, "class"))
if (!strcmp(buf, "class"))
return CLASS_MNEMONICS;
fprintf (stderr, "%s: %s must be one of \'HP\' or \'class\', not %s.\n",
fprintf(stderr, "%s: %s must be one of \'HP\' or \'class\', not %s.\n",
progname, name, buf);
return CLASS_MNEMONICS;
}
int get_boolean_resource (char *name, char *class) {
char *tmp, buf [100];
char *s = get_string_resource (name, class);
int get_boolean_resource(char *name, char *class) {
char *tmp, buf[100];
char *s = get_string_resource(name, class);
char *os = s;
if (! s) return 0;
for (tmp = buf; *s; s++)
*tmp++ = isupper (*s) ? _tolower (*s) : *s;
*tmp = 0;
free (os);
if (!strcmp (buf, "on") || !strcmp (buf, "true") || !strcmp (buf, "yes"))
return 1;
if (!strcmp (buf, "off") || !strcmp (buf, "false") || !strcmp (buf, "no"))
if (!s)
return 0;
fprintf (stderr, "%s: %s must be boolean, not %s.\n",
progname, name, buf);
for (tmp = buf; *s; s++)
*tmp++ = isupper(*s) ? _tolower(*s) : *s;
*tmp = 0;
free(os);
if (!strcmp(buf, "on") || !strcmp(buf, "true") || !strcmp(buf, "yes"))
return 1;
if (!strcmp(buf, "off") || !strcmp(buf, "false") || !strcmp(buf, "no"))
return 0;
fprintf(stderr, "%s: %s must be boolean, not %s.\n", progname, name, buf);
return 0;
}
int get_integer_resource (char *name, char *class) {
int get_integer_resource(char *name, char *class) {
int val;
char c, *s = get_string_resource (name, class);
if (!s) return 0;
if (1 == sscanf (s, " %d %c", &val, &c))
{
free (s);
char c, *s = get_string_resource(name, class);
if (!s)
return 0;
if (1 == sscanf(s, " %d %c", &val, &c)) {
free(s);
return val;
}
fprintf (stderr, "%s: %s must be an integer, not %s.\n",
progname, name, s);
free (s);
fprintf(stderr, "%s: %s must be an integer, not %s.\n", progname, name, s);
free(s);
return 0;
}
unsigned int get_pixel_resource (char *name, char *class, Display *dpy,
unsigned int get_pixel_resource(char *name, char *class, Display *dpy,
Colormap cmap) {
XColor color;
char *s = get_string_resource (name, class);
if (!s) goto DEFAULT;
char *s = get_string_resource(name, class);
if (!s)
goto DEFAULT;
if (! XParseColor (dpy, cmap, s, &color))
{
fprintf (stderr, "%s: can't parse color %s\n", progname, s);
if (!XParseColor(dpy, cmap, s, &color)) {
fprintf(stderr, "%s: can't parse color %s\n", progname, s);
goto DEFAULT;
}
if (! XAllocColor (dpy, cmap, &color))
{
fprintf (stderr, "%s: couldn't allocate color %s\n", progname, s);
if (!XAllocColor(dpy, cmap, &color)) {
fprintf(stderr, "%s: couldn't allocate color %s\n", progname, s);
goto DEFAULT;
}
free (s);
free(s);
return color.pixel;
DEFAULT:
if (s) free (s);
return (strcmp (class, "Background")
? WhitePixel (dpy, DefaultScreen (dpy))
: BlackPixel (dpy, DefaultScreen (dpy)));
DEFAULT:
if (s)
free(s);
return (strcmp(class, "Background") ? WhitePixel(dpy, DefaultScreen(dpy))
: BlackPixel(dpy, DefaultScreen(dpy)));
}
static Visual * pick_visual_of_class (Display *dpy, int visual_class, unsigned int *depth) {
static Visual *pick_visual_of_class(Display *dpy, int visual_class,
unsigned int *depth) {
XVisualInfo vi_in, *vi_out;
int out_count;
vi_in.class = visual_class;
vi_in.screen = DefaultScreen(dpy);
vi_out = XGetVisualInfo(dpy, VisualClassMask|VisualScreenMask,
&vi_in, &out_count);
if (vi_out)
{ /* choose the 'best' one, if multiple */
vi_out = XGetVisualInfo(dpy, VisualClassMask | VisualScreenMask, &vi_in,
&out_count);
if (vi_out) { /* choose the 'best' one, if multiple */
int i, best;
Visual *visual;
for (i = 0, best = 0; i < out_count; i++)
@ -229,26 +225,23 @@ static Visual * pick_visual_of_class (Display *dpy, int visual_class, unsigned i
best = i;
visual = vi_out[best].visual;
*depth = vi_out[best].depth;
XFree ((char *)vi_out);
XFree((char *)vi_out);
return visual;
}
else
{
} else {
*depth = DefaultDepth(dpy, DefaultScreen(dpy));
return DefaultVisual(dpy, DefaultScreen(dpy));
}
}
static Visual * id_to_visual (Display *dpy, int id, unsigned int *depth) {
static Visual *id_to_visual(Display *dpy, int id, unsigned int *depth) {
XVisualInfo vi_in, *vi_out;
int out_count;
vi_in.screen = DefaultScreen(dpy);
vi_in.visualid = id;
vi_out = XGetVisualInfo(dpy, VisualScreenMask|VisualIDMask,
&vi_in, &out_count);
if (vi_out)
{
vi_out =
XGetVisualInfo(dpy, VisualScreenMask | VisualIDMask, &vi_in, &out_count);
if (vi_out) {
Visual *v = vi_out[0].visual;
*depth = vi_out[0].depth;
XFree((char *)vi_out);
@ -257,7 +250,8 @@ static Visual * id_to_visual (Display *dpy, int id, unsigned int *depth) {
return 0;
}
Visual * get_visual_resource(Display *dpy, char *name, char *class, unsigned int *depth) {
Visual *get_visual_resource(Display *dpy, char *name, char *class,
unsigned int *depth) {
char c;
char *tmp, *s;
int vclass;
@ -266,42 +260,49 @@ Visual * get_visual_resource(Display *dpy, char *name, char *class, unsigned int
s = get_string_resource(name, class);
if (s)
for (tmp = s; *tmp; tmp++)
if (isupper(*tmp)) *tmp = _tolower(*tmp);
if (isupper(*tmp))
*tmp = _tolower(*tmp);
if (!s || !strcmp(s, "default")) vclass = -1;
else if (!strcmp (s, "staticgray")) vclass = StaticGray;
else if (!strcmp (s, "staticcolor")) vclass = StaticColor;
else if (!strcmp (s, "truecolor")) vclass = TrueColor;
else if (!strcmp (s, "grayscale")) vclass = GrayScale;
else if (!strcmp (s, "pseudocolor")) vclass = PseudoColor;
else if (!strcmp (s, "directcolor")) vclass = DirectColor;
else if (1 == sscanf (s, " %d %c", &id, &c)) vclass = -2;
else if (1 == sscanf (s, " 0x%x %c", &id, &c)) vclass = -2;
else
{
fprintf (stderr, "%s: unrecognized visual \"%s\".\n", progname, s);
if (!s || !strcmp(s, "default"))
vclass = -1;
else if (!strcmp(s, "staticgray"))
vclass = StaticGray;
else if (!strcmp(s, "staticcolor"))
vclass = StaticColor;
else if (!strcmp(s, "truecolor"))
vclass = TrueColor;
else if (!strcmp(s, "grayscale"))
vclass = GrayScale;
else if (!strcmp(s, "pseudocolor"))
vclass = PseudoColor;
else if (!strcmp(s, "directcolor"))
vclass = DirectColor;
else if (1 == sscanf(s, " %d %c", &id, &c))
vclass = -2;
else if (1 == sscanf(s, " 0x%x %c", &id, &c))
vclass = -2;
else {
fprintf(stderr, "%s: unrecognized visual \"%s\".\n", progname, s);
vclass = -1;
}
if (s) free (s);
if (s)
free(s);
if (vclass == -1)
{
if (vclass == -1) {
*depth = DefaultDepth(dpy, DefaultScreen(dpy));
return DefaultVisual(dpy, DefaultScreen(dpy));
}
else if (vclass == -2)
{
Visual *v = id_to_visual (dpy, id, depth);
if (v) return v;
fprintf (stderr, "%s: no visual with id 0x%x.\n", progname, id);
} else if (vclass == -2) {
Visual *v = id_to_visual(dpy, id, depth);
if (v)
return v;
fprintf(stderr, "%s: no visual with id 0x%x.\n", progname, id);
*depth = DefaultDepth(dpy, DefaultScreen(dpy));
return DefaultVisual(dpy, DefaultScreen(dpy));
}
else
} else
return pick_visual_of_class(dpy, vclass, depth);
}
XFontStruct * get_font_resource(Display *dpy, char *name, char *class) {
XFontStruct *get_font_resource(Display *dpy, char *name, char *class) {
char *s;
XFontStruct *f = (XFontStruct *)0;
@ -309,13 +310,11 @@ XFontStruct * get_font_resource(Display *dpy, char *name, char *class) {
if (s)
f = XLoadQueryFont(dpy, s);
else
{
else {
sprintf(errbuf, "can\'t get resource \'%s\'", name);
fatal_exit();
}
if (f == (XFontStruct *)0)
{
if (f == (XFontStruct *)0) {
sprintf(errbuf, "can\'t load font \'%s\'", s);
sprintf(fixbuf, "Please change resource \'%s\'", name);
fatal_exit();

View file

@ -61,39 +61,35 @@ extern char *res_class;
extern XrmDatabase rdb;
extern void usage __ProtoType__ ((void));
extern void show_version __ProtoType__ ((void));
extern void show_copyright __ProtoType__ ((void));
extern void show_warranty __ProtoType__ ((void));
extern void get_resources __ProtoType__ ((void));
extern char * get_string_resource_from_db __ProtoType__ ((XrmDatabase db,
extern void usage __ProtoType__((void));
extern void show_version __ProtoType__((void));
extern void show_copyright __ProtoType__((void));
extern void show_warranty __ProtoType__((void));
extern void get_resources __ProtoType__((void));
extern char *get_string_resource_from_db __ProtoType__((XrmDatabase db,
char *name,
char *class));
extern char * get_string_resource __ProtoType__ ((char *name,
char *class));
extern int get_boolean_resource __ProtoType__ ((char *name,
char *class));
extern int get_mnemonic_resource __ProtoType__ ((char *name,
char *class));
extern Visual * get_visual_resource __ProtoType__ ((Display *dpy,
char *name,
extern char *get_string_resource __ProtoType__((char *name, char *class));
extern int get_boolean_resource __ProtoType__((char *name, char *class));
extern int get_mnemonic_resource __ProtoType__((char *name, char *class));
extern Visual *get_visual_resource __ProtoType__((Display * dpy, char *name,
char *class,
unsigned int *depth));
extern XFontStruct * get_font_resource __ProtoType__ ((Display *dpy,
extern XFontStruct *get_font_resource __ProtoType__((Display * dpy,
char *res_name,
char *res_class));
#ifndef isupper
# define isupper(c) ((c) >= 'A' && (c) <= 'Z')
#define isupper(c) ((c) >= 'A' && (c) <= 'Z')
#endif
#ifndef islower
# define islower(c) ((c) >= 'a' && (c) <= 'z')
#define islower(c) ((c) >= 'a' && (c) <= 'z')
#endif
#ifndef _tolower
# define _tolower(c) ((c) - 'A' + 'a')
#define _tolower(c) ((c) - 'A' + 'a')
#endif
#ifndef _toupper
# define _toupper(c) ((c) - 'a' + 'A')
#define _toupper(c) ((c) - 'a' + 'A')
#endif
#endif /* !_RESOURCES_H */

View file

@ -27,8 +27,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/stat.h>
#include <unistd.h>
#include "global.h"
#include "resources.h"
@ -47,55 +47,42 @@ int read_rom_file(char *name, unsigned char **mem, int *size) {
*mem = NULL;
*size = 0;
if (NULL == (fp = fopen(name, "r")))
{
if (NULL == (fp = fopen(name, "r"))) {
fprintf(stderr, "can\'t open %s\n", name);
return 0;
}
if (stat(name, &st) < 0)
{
if (stat(name, &st) < 0) {
fprintf(stderr, "can\'t stat %s\n", name);
fclose(fp);
return 0;
}
if (fread(four, 1, 4, fp) != 4)
{
if (fread(four, 1, 4, fp) != 4) {
fprintf(stderr, "can\'t read first 4 bytes of %s\n", name);
fclose(fp);
return 0;
}
if (four[0] == 0x02 && four[1] == 0x03 &&
four[2] == 0x06 && four[3] == 0x09)
{
if (four[0] == 0x02 && four[1] == 0x03 && four[2] == 0x06 &&
four[3] == 0x09) {
*size = st.st_size;
}
else if (four[0] == 0x32 && four[1] == 0x96 &&
four[2] == 0x1b && four[3] == 0x80)
{
} else if (four[0] == 0x32 && four[1] == 0x96 && four[2] == 0x1b &&
four[3] == 0x80) {
*size = 2 * st.st_size;
}
else if (four[1] = 0x49)
{
} else if (four[1] = 0x49) {
fprintf(stderr, "%s is an HP49 ROM\n", name);
*size = 2 * st.st_size;
}
else if (four[0])
{
} else if (four[0]) {
printf("%d\n", st.st_size);
*size = st.st_size;
}
else
{
} else {
fprintf(stderr, "%s is not a HP48 ROM\n", name);
fclose(fp);
return 0;
}
if (fseek(fp, 0, 0) < 0)
{
if (fseek(fp, 0, 0) < 0) {
fprintf(stderr, "can\'t fseek to position 0 in %s\n", name);
*size = 0;
fclose(fp);
@ -104,13 +91,11 @@ int read_rom_file(char *name, unsigned char **mem, int *size) {
*mem = (unsigned char *)malloc(*size);
if (st.st_size == *size)
{
if (st.st_size == *size) {
/*
* size is same as memory size, old version file
*/
if (fread(*mem, 1, (size_t)*size, fp) != *size)
{
if (fread(*mem, 1, (size_t)*size, fp) != *size) {
fprintf(stderr, "can\'t read %s\n", name);
free(*mem);
*mem = NULL;
@ -118,17 +103,14 @@ int read_rom_file(char *name, unsigned char **mem, int *size) {
fclose(fp);
return 0;
}
}
else
{
} else {
/*
* size is different, check size and decompress memory
*/
if (st.st_size != *size / 2)
{
fprintf(stderr, "strange size %s, expected %d, found %ld\n",
name, *size / 2, st.st_size);
if (st.st_size != *size / 2) {
fprintf(stderr, "strange size %s, expected %d, found %ld\n", name,
*size / 2, st.st_size);
free(*mem);
*mem = NULL;
*size = 0;
@ -136,12 +118,9 @@ int read_rom_file(char *name, unsigned char **mem, int *size) {
return 0;
}
if (NULL == (tmp_mem = (unsigned char *)malloc((size_t)st.st_size)))
{
for (i = 0, j = 0; i < *size / 2; i++)
{
if (1 != fread(&byte, 1, 1, fp))
{
if (NULL == (tmp_mem = (unsigned char *)malloc((size_t)st.st_size))) {
for (i = 0, j = 0; i < *size / 2; i++) {
if (1 != fread(&byte, 1, 1, fp)) {
fprintf(stderr, "can\'t read %s\n", name);
free(*mem);
*mem = NULL;
@ -152,11 +131,8 @@ int read_rom_file(char *name, unsigned char **mem, int *size) {
(*mem)[j++] = byte & 0xf;
(*mem)[j++] = (byte >> 4) & 0xf;
}
}
else
{
if (fread(tmp_mem, 1, (size_t)*size / 2, fp) != *size / 2)
{
} else {
if (fread(tmp_mem, 1, (size_t)*size / 2, fp) != *size / 2) {
fprintf(stderr, "can\'t read %s\n", name);
free(*mem);
*mem = NULL;
@ -166,8 +142,7 @@ int read_rom_file(char *name, unsigned char **mem, int *size) {
return 0;
}
for (i = 0, j = 0; i < *size / 2; i++)
{
for (i = 0, j = 0; i < *size / 2; i++) {
(*mem)[j++] = tmp_mem[i] & 0xf;
(*mem)[j++] = (tmp_mem[i] >> 4) & 0xf;
}
@ -178,46 +153,31 @@ int read_rom_file(char *name, unsigned char **mem, int *size) {
fclose(fp);
if ((*mem)[0x29] == 0x00)
{
if (*size == ROM_SIZE_GX)
{
if ((*mem)[0x29] == 0x00) {
if (*size == ROM_SIZE_GX) {
opt_gx = 1;
}
else
if (*size == 4 * ROM_SIZE_GX)
{
fprintf(stderr, "%s seems to be HP49 ROM, but size is 0x%x\n",
name, *size);
} else if (*size == 4 * ROM_SIZE_GX) {
fprintf(stderr, "%s seems to be HP49 ROM, but size is 0x%x\n", name,
*size);
opt_gx = 2;
}
else
if (*size == 8 * ROM_SIZE_GX)
{
fprintf(stderr, "%s seems to be HP49 ROM, but size is 0x%x\n",
name, *size);
} else if (*size == 8 * ROM_SIZE_GX) {
fprintf(stderr, "%s seems to be HP49 ROM, but size is 0x%x\n", name,
*size);
opt_gx = 2;
}
else
{
fprintf(stderr, "%s seems to be G/GX ROM, but size is 0x%x\n",
name, *size);
} else {
fprintf(stderr, "%s seems to be G/GX ROM, but size is 0x%x\n", name,
*size);
free(*mem);
*mem = NULL;
*size = 0;
return 0;
}
}
else
{
if (*size == ROM_SIZE_SX)
{
} else {
if (*size == ROM_SIZE_SX) {
opt_gx = 0;
}
else
{
fprintf(stderr, "%s seems to be S/SX ROM, but size is 0x%x\n",
name, *size);
} else {
fprintf(stderr, "%s seems to be S/SX ROM, but size is 0x%x\n", name,
*size);
free(*mem);
*mem = NULL;
*size = 0;

527
src/rpl.c

File diff suppressed because it is too large Load diff

View file

@ -46,7 +46,6 @@
#define ROMPTAB_SX 0x707d9
#define ROMPTAB_GX 0x809a3
/*
* Object Prologs
*/
@ -102,31 +101,32 @@ typedef struct hp_real {
} hp_real;
extern char *decode_rpl_obj __ProtoType__((word_20 addr, char *buf));
extern void decode_rpl_obj_2 __ProtoType__((word_20 addr, char *typ, char *dat));
extern void decode_rpl_obj_2 __ProtoType__((word_20 addr, char *typ,
char *dat));
extern char *skip_ob __ProtoType__((word_20 *addr, char *string));
extern char *dec_rpl_obj __ProtoType__((word_20 *addr, char *string));
extern char *dec_bin_int __ProtoType__((word_20 *addr, char *string));
extern char *dec_real __ProtoType__((word_20 *addr, char *string));
extern char *dec_long_real __ProtoType__((word_20 *addr, char *string));
extern char *dec_complex __ProtoType__((word_20 *addr, char *string));
extern char *dec_long_complex __ProtoType__((word_20 *addr, char *string));
extern char *dec_char __ProtoType__((word_20 *addr, char *string));
extern char *dec_array __ProtoType__((word_20 *addr, char *string));
extern char *dec_lnk_array __ProtoType__((word_20 *addr, char *string));
extern char *dec_string __ProtoType__((word_20 *addr, char *string));
extern char *dec_hex_string __ProtoType__((word_20 *addr, char *string));
extern char *dec_list __ProtoType__((word_20 *addr, char *string));
extern char *dec_symb __ProtoType__((word_20 *addr, char *string));
extern char *dec_unit __ProtoType__((word_20 *addr, char *string));
extern char *dec_library __ProtoType__((word_20 *addr, char *string));
extern char *dec_library_data __ProtoType__((word_20 *addr, char *string));
extern char *dec_acptr __ProtoType__((word_20 *addr, char *string));
extern char *dec_prog __ProtoType__((word_20 *addr, char *string));
extern char *dec_code __ProtoType__((word_20 *addr, char *string));
extern char *dec_global_ident __ProtoType__((word_20 *addr, char *string));
extern char *dec_local_ident __ProtoType__((word_20 *addr, char *string));
extern char *dec_xlib_name __ProtoType__((word_20 *addr, char *string));
extern char *dec_unit_op __ProtoType__((word_20 *addr, char *string));
extern char *skip_ob __ProtoType__((word_20 * addr, char *string));
extern char *dec_rpl_obj __ProtoType__((word_20 * addr, char *string));
extern char *dec_bin_int __ProtoType__((word_20 * addr, char *string));
extern char *dec_real __ProtoType__((word_20 * addr, char *string));
extern char *dec_long_real __ProtoType__((word_20 * addr, char *string));
extern char *dec_complex __ProtoType__((word_20 * addr, char *string));
extern char *dec_long_complex __ProtoType__((word_20 * addr, char *string));
extern char *dec_char __ProtoType__((word_20 * addr, char *string));
extern char *dec_array __ProtoType__((word_20 * addr, char *string));
extern char *dec_lnk_array __ProtoType__((word_20 * addr, char *string));
extern char *dec_string __ProtoType__((word_20 * addr, char *string));
extern char *dec_hex_string __ProtoType__((word_20 * addr, char *string));
extern char *dec_list __ProtoType__((word_20 * addr, char *string));
extern char *dec_symb __ProtoType__((word_20 * addr, char *string));
extern char *dec_unit __ProtoType__((word_20 * addr, char *string));
extern char *dec_library __ProtoType__((word_20 * addr, char *string));
extern char *dec_library_data __ProtoType__((word_20 * addr, char *string));
extern char *dec_acptr __ProtoType__((word_20 * addr, char *string));
extern char *dec_prog __ProtoType__((word_20 * addr, char *string));
extern char *dec_code __ProtoType__((word_20 * addr, char *string));
extern char *dec_global_ident __ProtoType__((word_20 * addr, char *string));
extern char *dec_local_ident __ProtoType__((word_20 * addr, char *string));
extern char *dec_xlib_name __ProtoType__((word_20 * addr, char *string));
extern char *dec_unit_op __ProtoType__((word_20 * addr, char *string));
#endif /* !_RPL_H */

View file

@ -60,28 +60,27 @@
* $Id: serial.c,v 1.11 1995/01/11 18:20:01 ecd Exp ecd $
*/
#include "global.h"
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
#include <errno.h>
#include <sys/time.h>
#if defined(HPUX) || defined(CSRG_BASED)
# include <sys/ioctl.h>
#include <sys/ioctl.h>
#endif
#include <unistd.h>
#include <termios.h>
#include <unistd.h>
#ifdef SOLARIS
# include <sys/stream.h>
# include <sys/stropts.h>
# include <sys/termios.h>
#include <sys/stream.h>
#include <sys/stropts.h>
#include <sys/termios.h>
#endif
#include "hp48.h"
#include "device.h"
#include "hp48.h"
#include "hp48_emu.h"
#include "resources.h"
#include "x48_x11.h"
@ -98,14 +97,14 @@ static char *ir_name = (char *)0;
/* #define DEBUG_SERIAL */
void update_connection_display(void) {
if (wire_fd == -1)
{
if (wire_name) free(wire_name);
if (wire_fd == -1) {
if (wire_name)
free(wire_name);
wire_name = (char *)0;
}
if (ir_fd == -1)
{
if (ir_name) free(ir_name);
if (ir_fd == -1) {
if (ir_name)
free(ir_name);
ir_name = (char *)0;
}
ShowConnections(wire_name, ir_name);
@ -120,126 +119,98 @@ int serial_init(void) {
wire_fd = -1;
ttyp = -1;
if (useTerminal)
{
if (useTerminal) {
#if defined(IRIX)
if ((p = _getpty(&wire_fd, O_RDWR | O_EXCL | O_NDELAY, 0666, 0)) == NULL)
{
if ((p = _getpty(&wire_fd, O_RDWR | O_EXCL | O_NDELAY, 0666, 0)) == NULL) {
wire_fd = -1;
ttyp = -1;
}
else
{
if ((ttyp = open(p, O_RDWR | O_NDELAY, 0666)) < 0)
{
} else {
if ((ttyp = open(p, O_RDWR | O_NDELAY, 0666)) < 0) {
close(wire_fd);
wire_fd = -1;
ttyp = -1;
}
else
{
} else {
if (verbose)
printf("%s: wire connection on %s\n", progname, p);
wire_name = strdup(p);
}
}
#elif defined(SOLARIS)
if ((wire_fd = open("/dev/ptmx", O_RDWR | O_NONBLOCK, 0666)) >= 0)
{
if ((wire_fd = open("/dev/ptmx", O_RDWR | O_NONBLOCK, 0666)) >= 0) {
grantpt(wire_fd);
unlockpt(wire_fd);
p = ptsname(wire_fd);
strcpy(tty_dev_name, p);
if ((ttyp = open(tty_dev_name, O_RDWR | O_NDELAY, 0666)) >= 0)
{
if ((ttyp = open(tty_dev_name, O_RDWR | O_NDELAY, 0666)) >= 0) {
ioctl(ttyp, I_PUSH, "ptem");
ioctl(ttyp, I_PUSH, "ldterm");
if (verbose)
printf("%s: wire connection on %s\n", progname,
tty_dev_name);
printf("%s: wire connection on %s\n", progname, tty_dev_name);
wire_name = strdup(tty_dev_name);
}
}
#elif defined(LINUX)
/* Unix98 PTY (Preferred) */
if ((wire_fd = open("/dev/ptmx", O_RDWR | O_NONBLOCK, 0666)) >= 0)
{
if ((wire_fd = open("/dev/ptmx", O_RDWR | O_NONBLOCK, 0666)) >= 0) {
grantpt(wire_fd);
unlockpt(wire_fd);
if (ptsname_r(wire_fd, tty_dev_name, 128)) {
perror("Could not get the name of the wire device.");
exit(-1);
}
if ((ttyp = open(tty_dev_name, O_RDWR | O_NDELAY, 0666)) >= 0)
{
if ((ttyp = open(tty_dev_name, O_RDWR | O_NDELAY, 0666)) >= 0) {
if (verbose)
printf("%s: wire connection on %s\n", progname,
tty_dev_name);
printf("%s: wire connection on %s\n", progname, tty_dev_name);
wire_name = strdup(tty_dev_name);
}
}
/* BSD PTY (Legacy) */
else
{
else {
c = 'p';
do
{
for (n = 0; n < 16; n++)
{
do {
for (n = 0; n < 16; n++) {
sprintf(tty_dev_name, "/dev/pty%c%x", c, n);
if ((wire_fd = open(tty_dev_name,
O_RDWR | O_EXCL | O_NDELAY, 0666)) >= 0)
{
if ((wire_fd =
open(tty_dev_name, O_RDWR | O_EXCL | O_NDELAY, 0666)) >= 0) {
ttyp = wire_fd;
sprintf(tty_dev_name, "/dev/tty%c%x", c, n);
if (verbose)
printf("%s: wire connection on %s\n", progname,
tty_dev_name);
printf("%s: wire connection on %s\n", progname, tty_dev_name);
wire_name = strdup(tty_dev_name);
break;
}
}
c++;
}
while ((wire_fd < 0) && (errno != ENOENT));
} while ((wire_fd < 0) && (errno != ENOENT));
}
#else
/*
* Here we go for SUNOS, HPUX
*/
c = 'p';
do
{
for (n = 0; n < 16; n++)
{
do {
for (n = 0; n < 16; n++) {
sprintf(tty_dev_name, "/dev/ptyp%x", n);
if ((wire_fd = open(tty_dev_name,
O_RDWR | O_EXCL | O_NDELAY, 0666)) >= 0)
{
if ((wire_fd = open(tty_dev_name, O_RDWR | O_EXCL | O_NDELAY, 0666)) >=
0) {
sprintf(tty_dev_name, "/dev/tty%c%x", c, n);
if ((ttyp = open(tty_dev_name, O_RDWR | O_NDELAY, 0666)) < 0)
{
if ((ttyp = open(tty_dev_name, O_RDWR | O_NDELAY, 0666)) < 0) {
wire_fd = -1;
ttyp = -1;
}
else
{
} else {
if (verbose)
printf("%s: wire connection on %s\n", progname,
tty_dev_name);
printf("%s: wire connection on %s\n", progname, tty_dev_name);
wire_name = strdup(tty_dev_name);
break;
}
}
}
c++;
}
while ((wire_fd < 0) && (errno != ENOENT));
} while ((wire_fd < 0) && (errno != ENOENT));
#endif
}
if (ttyp >= 0)
{
if (ttyp >= 0) {
#if defined(TCSANOW)
if (tcgetattr(ttyp, &ttybuf) < 0)
#else
@ -263,8 +234,7 @@ int serial_init(void) {
ttybuf.c_cc[VTIME] = 0;
ttybuf.c_cc[VMIN] = 1;
if (ttyp >= 0)
{
if (ttyp >= 0) {
#if defined(TCSANOW)
if (tcsetattr(ttyp, TCSANOW, &ttybuf) < 0)
#else
@ -280,19 +250,16 @@ int serial_init(void) {
}
ir_fd = -1;
if (useSerial)
{
if (useSerial) {
sprintf(tty_dev_name, serialLine);
if ((ir_fd = open(tty_dev_name, O_RDWR | O_NDELAY)) >= 0)
{
if ((ir_fd = open(tty_dev_name, O_RDWR | O_NDELAY)) >= 0) {
if (verbose)
printf("%s: IR connection on %s\n", progname, tty_dev_name);
ir_name = strdup(tty_dev_name);
}
}
if (ir_fd >= 0)
{
if (ir_fd >= 0) {
#if defined(TCSANOW)
if (tcgetattr(ir_fd, &ttybuf) < 0)
#else
@ -300,8 +267,8 @@ int serial_init(void) {
#endif
{
if (!quiet)
fprintf(stderr, "%s: ioctl(IR, TCGETS) failed, errno = %d\n",
progname, errno);
fprintf(stderr, "%s: ioctl(IR, TCGETS) failed, errno = %d\n", progname,
errno);
ir_fd = -1;
}
}
@ -315,8 +282,7 @@ int serial_init(void) {
ttybuf.c_cc[VTIME] = 0;
ttybuf.c_cc[VMIN] = 1;
if (ir_fd >= 0)
{
if (ir_fd >= 0) {
#if defined(TCSANOW)
if (tcsetattr(ir_fd, TCSANOW, &ttybuf) < 0)
#else
@ -324,8 +290,8 @@ int serial_init(void) {
#endif
{
if (!quiet)
fprintf(stderr, "%s: ioctl(IR, TCSETS) failed, errno = %d\n",
progname, errno);
fprintf(stderr, "%s: ioctl(IR, TCSETS) failed, errno = %d\n", progname,
errno);
ir_fd = -1;
}
}
@ -337,8 +303,7 @@ void serial_baud(int baud) {
int error = 0;
struct termios ttybuf;
if (ir_fd >= 0)
{
if (ir_fd >= 0) {
#if defined(TCSANOW)
if (tcgetattr(ir_fd, &ttybuf) < 0)
#else
@ -346,8 +311,8 @@ void serial_baud(int baud) {
#endif
{
if (!quiet)
fprintf(stderr, "%s: ioctl(IR, TCGETS) failed, errno = %d\n",
progname, errno);
fprintf(stderr, "%s: ioctl(IR, TCGETS) failed, errno = %d\n", progname,
errno);
ir_fd = -1;
error = 1;
}
@ -355,44 +320,42 @@ void serial_baud(int baud) {
#if defined(__APPLE__)
baud &= 0x7;
switch (baud)
{
switch (baud) {
case 0: /* 1200 */
ttybuf.c_cflag |= B1200;
break;
case 1: /* 1920 */
# ifdef B1920
#ifdef B1920
ttybuf.c_cflag |= B1920;
# endif
#endif
break;
case 2: /* 2400 */
ttybuf.c_cflag |= B2400;
break;
case 3: /* 3840 */
# ifdef B3840
#ifdef B3840
ttybuf.c_cflag |= B3840;
# endif
#endif
break;
case 4: /* 4800 */
ttybuf.c_cflag |= B4800;
break;
case 5: /* 7680 */
# ifdef B7680
#ifdef B7680
ttybuf.c_cflag |= B7680;
# endif
#endif
break;
case 6: /* 9600 */
ttybuf.c_cflag |= B9600;
break;
case 7: /* 15360 */
# ifdef B15360
#ifdef B15360
ttybuf.c_cflag |= B15360;
# endif
#endif
break;
}
if ((ir_fd >= 0) && ((ttybuf.c_ospeed) == 0))
{
if ((ir_fd >= 0) && ((ttybuf.c_ospeed) == 0)) {
if (!quiet)
fprintf(stderr, "%s: can\'t set baud rate, using 9600\n", progname);
ttybuf.c_cflag |= B9600;
@ -401,51 +364,48 @@ void serial_baud(int baud) {
ttybuf.c_cflag &= ~CBAUD;
baud &= 0x7;
switch (baud)
{
switch (baud) {
case 0: /* 1200 */
ttybuf.c_cflag |= B1200;
break;
case 1: /* 1920 */
# ifdef B1920
#ifdef B1920
ttybuf.c_cflag |= B1920;
# endif
#endif
break;
case 2: /* 2400 */
ttybuf.c_cflag |= B2400;
break;
case 3: /* 3840 */
# ifdef B3840
#ifdef B3840
ttybuf.c_cflag |= B3840;
# endif
#endif
break;
case 4: /* 4800 */
ttybuf.c_cflag |= B4800;
break;
case 5: /* 7680 */
# ifdef B7680
#ifdef B7680
ttybuf.c_cflag |= B7680;
# endif
#endif
break;
case 6: /* 9600 */
ttybuf.c_cflag |= B9600;
break;
case 7: /* 15360 */
# ifdef B15360
#ifdef B15360
ttybuf.c_cflag |= B15360;
# endif
#endif
break;
}
if ((ir_fd >= 0) && ((ttybuf.c_cflag & CBAUD) == 0))
{
if ((ir_fd >= 0) && ((ttybuf.c_cflag & CBAUD) == 0)) {
if (!quiet)
fprintf(stderr, "%s: can\'t set baud rate, using 9600\n", progname);
ttybuf.c_cflag |= B9600;
}
#endif
if (ir_fd >= 0)
{
if (ir_fd >= 0) {
#if defined(TCSANOW)
if (tcsetattr(ir_fd, TCSANOW, &ttybuf) < 0)
#else
@ -453,15 +413,14 @@ void serial_baud(int baud) {
#endif
{
if (!quiet)
fprintf(stderr, "%s: ioctl(IR, TCSETS) failed, errno = %d\n",
progname, errno);
fprintf(stderr, "%s: ioctl(IR, TCSETS) failed, errno = %d\n", progname,
errno);
ir_fd = -1;
error = 1;
}
}
if (ttyp >= 0)
{
if (ttyp >= 0) {
#if defined(TCSANOW)
if (tcgetattr(ttyp, &ttybuf) < 0)
#else
@ -482,51 +441,48 @@ void serial_baud(int baud) {
ttybuf.c_cflag &= ~CBAUD;
baud &= 0x7;
switch (baud)
{
switch (baud) {
case 0: /* 1200 */
ttybuf.c_cflag |= B1200;
break;
case 1: /* 1920 */
# ifdef B1920
#ifdef B1920
ttybuf.c_cflag |= B1920;
# endif
#endif
break;
case 2: /* 2400 */
ttybuf.c_cflag |= B2400;
break;
case 3: /* 3840 */
# ifdef B3840
#ifdef B3840
ttybuf.c_cflag |= B3840;
# endif
#endif
break;
case 4: /* 4800 */
ttybuf.c_cflag |= B4800;
break;
case 5: /* 7680 */
# ifdef B7680
#ifdef B7680
ttybuf.c_cflag |= B7680;
# endif
#endif
break;
case 6: /* 9600 */
ttybuf.c_cflag |= B9600;
break;
case 7: /* 15360 */
# ifdef B15360
#ifdef B15360
ttybuf.c_cflag |= B15360;
# endif
#endif
break;
}
if ((ttyp >= 0) && ((ttybuf.c_cflag & CBAUD) == 0))
{
if ((ttyp >= 0) && ((ttybuf.c_cflag & CBAUD) == 0)) {
if (!quiet)
fprintf(stderr, "%s: can\'t set baud rate, using 9600\n", progname);
ttybuf.c_cflag |= B9600;
}
#endif
if (ttyp >= 0)
{
if (ttyp >= 0) {
#if defined(TCSANOW)
if (tcsetattr(ttyp, TCSANOW, &ttybuf) < 0)
#else
@ -545,7 +501,6 @@ void serial_baud(int baud) {
update_connection_display();
}
void transmit_char(void) {
#ifdef DEBUG_SERIALx
fprintf(stderr, "XMT %s\n", (saturn.ir_ctrl & 0x04) ? "IR" : "wire");

View file

@ -196,134 +196,133 @@ typedef struct letter_t {
} letter_t;
letter_t small_font[] = {
{ 0, 0, 0 },
{ nl_gx_width, nl_gx_height, nl_gx_bits }, /* \001 == \n gx */
{ comma_gx_width, comma_gx_height, comma_gx_bits }, /* \002 == comma gx */
{ arrow_gx_width, arrow_gx_height, arrow_gx_bits }, /* \003 == \-> gx */
{ equal_gx_width, equal_gx_height, equal_gx_bits }, /* \004 == equal gx */
{ pi_gx_width, pi_gx_height, pi_gx_bits }, /* \005 == pi gx */
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 }, /* # 16 */
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ blank_width, blank_height, blank_bits }, /* # 32 */
{ 0, 0, 0 },
{ 0, 0, 0 },
{ hash_width, hash_height, hash_bits },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ lbrace_width, lbrace_height, lbrace_bits },
{ rbrace_width, rbrace_height, rbrace_bits },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ comma_width, comma_height, comma_bits },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ slash_width, slash_height, slash_bits },
{ 0, 0, 0 }, /* # 48 */
{ 0, 0, 0 },
{ two_width, two_height, two_bits },
{ three_width, three_height, three_bits },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ small_colon_width, small_colon_height, small_colon_bits },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ equal_width, equal_height, equal_bits },
{ 0, 0, 0 },
{ 0, 0, 0 },
{ 0, 0, 0 }, /* # 64 */
{ A_width, A_height, A_bits },
{ B_width, B_height, B_bits },
{ C_width, C_height, C_bits },
{ D_width, D_height, D_bits },
{ E_width, E_height, E_bits },
{ F_width, F_height, F_bits },
{ G_width, G_height, G_bits },
{ H_width, H_height, H_bits },
{ I_width, I_height, I_bits },
{ J_width, J_height, J_bits },
{ K_width, K_height, K_bits },
{ L_width, L_height, L_bits },
{ M_width, M_height, M_bits },
{ N_width, N_height, N_bits },
{ O_width, O_height, O_bits },
{ P_width, P_height, P_bits }, /* # 80 */
{ Q_width, Q_height, Q_bits },
{ R_width, R_height, R_bits },
{ S_width, S_height, S_bits },
{ T_width, T_height, T_bits },
{ U_width, U_height, U_bits },
{ V_width, V_height, V_bits },
{ W_width, W_height, W_bits },
{ X_width, X_height, X_bits },
{ Y_width, Y_height, Y_bits },
{ Z_width, Z_height, Z_bits },
{ lbracket_width, lbracket_height, lbracket_bits },
{ 0, 0, 0 },
{ rbracket_width, rbracket_height, rbracket_bits },
{ 0, 0, 0 },
{ under_width, under_height, under_bits },
{ 0, 0, 0 }, /* # 96 */
{ arrow_width, arrow_height, arrow_bits }, /* a == left arrow */
{ diff_width, diff_height, diff_bits }, /* b == differential */
{ integral_width, integral_height, integral_bits }, /* c == integral */
{ sigma_width, sigma_height, sigma_bits }, /* d == sigma */
{ sqr_width, sqr_height, sqr_bits }, /* e == sqr */
{ root_width, root_height, root_bits }, /* f == root */
{ pow10_width, pow10_height, pow10_bits }, /* g == pow10 */
{ exp_width, exp_height, exp_bits }, /* h == exp */
{ prog_width, prog_height, prog_bits }, /* i == << >> */
{ string_width, string_height, string_bits }, /* j == " " */
{ nl_width, nl_height, nl_bits }, /* k == New Line */
{ pi_width, pi_height, pi_bits }, /* l == pi */
{ angle_width, angle_height, angle_bits }, /* m == angle */
{ sqr_gx_width, sqr_gx_height, sqr_gx_bits }, /* n == sqr gx */
{ root_gx_width, root_gx_height, root_gx_bits }, /* o == root gx */
{ pow10_gx_width, pow10_gx_height, pow10_gx_bits }, /* p == pow10 gx */
{ exp_gx_width, exp_gx_height, exp_gx_bits }, /* q == exp gx */
{ parens_gx_width, parens_gx_height, parens_gx_bits },/* r == ( ) gx */
{ hash_gx_width, hash_gx_height, hash_gx_bits }, /* s == # gx */
{ bracket_gx_width, bracket_gx_height, bracket_gx_bits }, /* t == [] gx */
{ under_gx_width, under_gx_height, under_gx_bits }, /* u == _ gx */
{ prog_gx_width, prog_gx_height, prog_gx_bits }, /* v == << >> gx */
{ quote_gx_width, quote_gx_height, quote_gx_bits }, /* w == " " gx */
{ curly_gx_width, curly_gx_height, curly_gx_bits }, /* x == {} gx */
{ colon_gx_width, colon_gx_height, colon_gx_bits }, /* y == :: gx */
{ angle_gx_width, angle_gx_height, angle_gx_bits }, /* z == angle gx */
{ lcurly_width, lcurly_height, lcurly_bits },
{ 0, 0, 0 },
{ rcurly_width, rcurly_height, rcurly_bits },
{ 0, 0, 0 },
{ 0, 0, 0 }
};
{0, 0, 0},
{nl_gx_width, nl_gx_height, nl_gx_bits}, /* \001 == \n gx */
{comma_gx_width, comma_gx_height, comma_gx_bits}, /* \002 == comma gx */
{arrow_gx_width, arrow_gx_height, arrow_gx_bits}, /* \003 == \-> gx */
{equal_gx_width, equal_gx_height, equal_gx_bits}, /* \004 == equal gx */
{pi_gx_width, pi_gx_height, pi_gx_bits}, /* \005 == pi gx */
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0}, /* # 16 */
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{blank_width, blank_height, blank_bits}, /* # 32 */
{0, 0, 0},
{0, 0, 0},
{hash_width, hash_height, hash_bits},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{lbrace_width, lbrace_height, lbrace_bits},
{rbrace_width, rbrace_height, rbrace_bits},
{0, 0, 0},
{0, 0, 0},
{comma_width, comma_height, comma_bits},
{0, 0, 0},
{0, 0, 0},
{slash_width, slash_height, slash_bits},
{0, 0, 0}, /* # 48 */
{0, 0, 0},
{two_width, two_height, two_bits},
{three_width, three_height, three_bits},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{small_colon_width, small_colon_height, small_colon_bits},
{0, 0, 0},
{0, 0, 0},
{equal_width, equal_height, equal_bits},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0}, /* # 64 */
{A_width, A_height, A_bits},
{B_width, B_height, B_bits},
{C_width, C_height, C_bits},
{D_width, D_height, D_bits},
{E_width, E_height, E_bits},
{F_width, F_height, F_bits},
{G_width, G_height, G_bits},
{H_width, H_height, H_bits},
{I_width, I_height, I_bits},
{J_width, J_height, J_bits},
{K_width, K_height, K_bits},
{L_width, L_height, L_bits},
{M_width, M_height, M_bits},
{N_width, N_height, N_bits},
{O_width, O_height, O_bits},
{P_width, P_height, P_bits}, /* # 80 */
{Q_width, Q_height, Q_bits},
{R_width, R_height, R_bits},
{S_width, S_height, S_bits},
{T_width, T_height, T_bits},
{U_width, U_height, U_bits},
{V_width, V_height, V_bits},
{W_width, W_height, W_bits},
{X_width, X_height, X_bits},
{Y_width, Y_height, Y_bits},
{Z_width, Z_height, Z_bits},
{lbracket_width, lbracket_height, lbracket_bits},
{0, 0, 0},
{rbracket_width, rbracket_height, rbracket_bits},
{0, 0, 0},
{under_width, under_height, under_bits},
{0, 0, 0}, /* # 96 */
{arrow_width, arrow_height, arrow_bits}, /* a == left arrow */
{diff_width, diff_height, diff_bits}, /* b == differential */
{integral_width, integral_height, integral_bits}, /* c == integral */
{sigma_width, sigma_height, sigma_bits}, /* d == sigma */
{sqr_width, sqr_height, sqr_bits}, /* e == sqr */
{root_width, root_height, root_bits}, /* f == root */
{pow10_width, pow10_height, pow10_bits}, /* g == pow10 */
{exp_width, exp_height, exp_bits}, /* h == exp */
{prog_width, prog_height, prog_bits}, /* i == << >> */
{string_width, string_height, string_bits}, /* j == " " */
{nl_width, nl_height, nl_bits}, /* k == New Line */
{pi_width, pi_height, pi_bits}, /* l == pi */
{angle_width, angle_height, angle_bits}, /* m == angle */
{sqr_gx_width, sqr_gx_height, sqr_gx_bits}, /* n == sqr gx */
{root_gx_width, root_gx_height, root_gx_bits}, /* o == root gx */
{pow10_gx_width, pow10_gx_height, pow10_gx_bits}, /* p == pow10 gx */
{exp_gx_width, exp_gx_height, exp_gx_bits}, /* q == exp gx */
{parens_gx_width, parens_gx_height, parens_gx_bits}, /* r == ( ) gx */
{hash_gx_width, hash_gx_height, hash_gx_bits}, /* s == # gx */
{bracket_gx_width, bracket_gx_height, bracket_gx_bits}, /* t == [] gx */
{under_gx_width, under_gx_height, under_gx_bits}, /* u == _ gx */
{prog_gx_width, prog_gx_height, prog_gx_bits}, /* v == << >> gx */
{quote_gx_width, quote_gx_height, quote_gx_bits}, /* w == " " gx */
{curly_gx_width, curly_gx_height, curly_gx_bits}, /* x == {} gx */
{colon_gx_width, colon_gx_height, colon_gx_bits}, /* y == :: gx */
{angle_gx_width, angle_gx_height, angle_gx_bits}, /* z == angle gx */
{lcurly_width, lcurly_height, lcurly_bits},
{0, 0, 0},
{rcurly_width, rcurly_height, rcurly_bits},
{0, 0, 0},
{0, 0, 0}};
#endif /* !_SMALL_H */

View file

@ -40,14 +40,14 @@
#include "global.h"
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <time.h>
#include <unistd.h>
#include "timer.h"
#include "debugger.h"
#include "romio.h"
#include "timer.h"
#include <assert.h>
@ -55,7 +55,7 @@
/* #define DEBUG_TIMER_ADJUST 1 */
#ifdef SOLARIS
extern int gettimeofday __ProtoType__((struct timeval *tp));
extern int gettimeofday __ProtoType__((struct timeval * tp));
#endif
#ifdef SUNOS
extern int gettimeofday __ProtoType__((struct timeval *, struct timezone *));
@ -136,7 +136,7 @@ void set_accesstime(void) {
ltm = localtime(&gmt);
#if defined(SYSV_TIME) || defined(__sgi)
systime_offset = timezone;
if( ltm->tm_isdst )
if (ltm->tm_isdst)
systime_offset -= 3600;
#else
systime_offset = -ltm->tm_gmtoff;
@ -157,8 +157,7 @@ void set_accesstime(void) {
ticks += time_offset;
timer2 = saturn.timer2;
if (saturn.timer2 & 0x80000000)
{
if (saturn.timer2 & 0x80000000) {
assert(timer2 < 0);
}
@ -168,39 +167,33 @@ void set_accesstime(void) {
crc = 0x0;
if (opt_gx)
{
if (opt_gx) {
accesstime_loc = ACCESSTIME_GX;
accesscrc_loc = ACCESSCRC_GX;
timeout_loc = TIMEOUT_GX;
timeoutclk_loc = TIMEOUTCLK_GX;
}
else
{
} else {
accesstime_loc = ACCESSTIME_SX;
accesscrc_loc = ACCESSCRC_SX;
timeout_loc = TIMEOUT_SX;
timeoutclk_loc = TIMEOUTCLK_SX;
}
for (i = 0; i < 13; i++)
{
for (i = 0; i < 13; i++) {
val = ticks & 0xf;
calc_crc(val);
saturn.ram[accesstime_loc + i] = val;
ticks >>= 4;
}
for (i = 0; i < 4; i++)
{
for (i = 0; i < 4; i++) {
saturn.ram[accesscrc_loc + i] = crc & 0xf;
crc >>= 4;
}
timeout += ticks_10_min;
for (i = 0; i < 13; i++)
{
for (i = 0; i < 13; i++) {
val = timeout & 0xf;
calc_crc(val);
saturn.ram[timeout_loc + i] = val;
@ -237,7 +230,8 @@ void start_timer(int timer) {
timers[timer].start += (tv.tv_usec << 7) / 15625;
}
#ifdef DEBUG_TIMER
fprintf(stderr, "Timer%c[%d] start at 0x%lx\n", timer == T1_TIMER?'*':' ', timer, timers[timer].start);
fprintf(stderr, "Timer%c[%d] start at 0x%lx\n", timer == T1_TIMER ? '*' : ' ',
timer, timers[timer].start);
#endif
}
@ -271,8 +265,7 @@ void restart_timer(int timer) {
timers[timer].start += (tv.tv_usec << 7) / 15625;
}
#ifdef DEBUG_TIMER
fprintf(stderr, "Timer[%d] restart at 0x%lx\n", timer,
timers[timer].start);
fprintf(stderr, "Timer[%d] restart at 0x%lx\n", timer, timers[timer].start);
#endif
}
@ -306,11 +299,12 @@ void stop_timer(int timer) {
}
timers[timer].value += timers[timer].stop - timers[timer].start;
// add_sub_64(&timers[timer].stop, &timers[timer].start, &timers[timer].value);
// add_sub_64(&timers[timer].stop, &timers[timer].start,
// &timers[timer].value);
#ifdef DEBUG_TIMER
fprintf(stderr, "Timer[%d] stop at 0x%llx, value 0x%llx\n",
timer, timers[timer].stop, timers[timer].value);
fprintf(stderr, "Timer[%d] stop at 0x%llx, value 0x%llx\n", timer,
timers[timer].stop, timers[timer].value);
#endif
}
@ -393,12 +387,10 @@ t1_t2_ticks get_t1_t2(void) {
#endif
tv.tv_sec -= systime_offset;
if (timers[T1_TIMER].run)
{
if (timers[T1_TIMER].run) {
stop = (tv.tv_sec << 9);
stop += (tv.tv_usec / 15625) >> 3;
if (timers[T1_TIMER].start <= stop)
{
if (timers[T1_TIMER].start <= stop) {
timers[T1_TIMER].value += stop - timers[T1_TIMER].start;
} else {
fprintf(stderr, "clock running backwards\n");
@ -416,32 +408,27 @@ t1_t2_ticks get_t1_t2(void) {
access_time = 0x0;
for (i = 13 - 1; i >= 0; i--)
{
for (i = 13 - 1; i >= 0; i--) {
access_time <<= 4;
access_time |= ((int)saturn.ram[accesstime_loc + i] & 0xf);
}
access_time -= stop;
if (adj_time_pending || in_debugger)
{
if (adj_time_pending || in_debugger) {
/*
* We have been inside an interrupt for very long, maybe
* or we are sleeping in the debugger.
* Don't adjust the time, can't come from user, anyhow.
*/
if ((saturn.timer2 >= 0 && access_time < 0)
|| ((unsigned long)saturn.timer2 > access_time))
{
if ((saturn.timer2 >= 0 && access_time < 0) ||
((unsigned long)saturn.timer2 > access_time)) {
/*
* check OK, return calculated time
*/
ticks.t2_ticks = access_time;
}
else
{
} else {
/*
* Don't increment timer2, return old value and
* slow down timer2.
@ -473,16 +460,13 @@ t1_t2_ticks get_t1_t2(void) {
#endif
}
if ((saturn.timer2 >= 0 && (access_time < 0))
|| ((unsigned long)saturn.timer2 > access_time))
{
if ((saturn.timer2 >= 0 && (access_time < 0)) ||
((unsigned long)saturn.timer2 > access_time)) {
/*
* check OK, return calculated time
*/
ticks.t2_ticks = access_time;
}
else
{
} else {
/*
* Don't increment timer2, return old value and
* slow down timer2.

View file

@ -54,7 +54,7 @@ extern void start_timer __ProtoType__((int timer));
extern void restart_timer __ProtoType__((int timer));
extern void stop_timer __ProtoType__((int timer));
extern word_64 get_timer __ProtoType__((int timer));
extern long diff_timer __ProtoType__((word_64 *t1, word_64 *t2));
extern long diff_timer __ProtoType__((word_64 * t1, word_64 *t2));
extern t1_t2_ticks get_t1_t2 __ProtoType__((void));
extern void set_accesstime __ProtoType__((void));

File diff suppressed because it is too large Load diff

View file

@ -65,9 +65,9 @@
#include <X11/Xlib.h>
#ifdef HAVE_XSHM
#include <X11/extensions/XShm.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <X11/extensions/XShm.h>
#endif
#define WHITE 0