added header file dependencies

corrected stack order for more functions
This commit is contained in:
Markus Fröschle
2013-05-05 06:22:22 +00:00
parent ead990d1a1
commit 7e6e79c385
5 changed files with 149 additions and 105 deletions

View File

@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8

View File

@@ -15,24 +15,25 @@ CFLAGS=-mcpu=68030 \
EMUSD=emusd
APP=$(EMUSD).prg
all: $(APP)
all: $(APP) xhditest.prg
SOURCES=$(EMUSD).c \
cookie.c
OBJECTS=$(SOURCES:.c=.o)
$(APP): $(OBJECTS)
$(APP): $(OBJECTS) depend
$(CC) $(CFLAGS) $(OBJECTS) -o $(APP)
test: xhdi_test.c
test: xhditest.prg
xhditest.prg: xhdi_test.c depend
$(CC) $(CFLAGS) -Wl,-traditional-format xhdi_test.c -o xhditest.prg
.PHONY clean:
- rm -rf *.o depend xhditest.prg
depend: $(SOURCES)
$(CC) $(CFLAGS) $(INCLUDE) -M $(SOURCES) | sed -e 's/^\(.*\).o:/$(OBJDIR)\/\1.o:/' > depend
$(CC) $(CFLAGS) $(INCLUDE) -M $(SOURCES) xhdi_test.c > depend
ifneq (clean,$(MAKECMDGOALS))

View File

@@ -10,6 +10,10 @@
#include <stdint.h>
/*
* get and set named cookies. Although these routines do access the cookiejar system variable (which is
* protected), they do not need to be called in supervisor mode
*/
extern int getcookie(uint32_t cookie, uint32_t *p_value);
extern void setcookie(uint32_t cookie, uint32_t value);

45
sd-emutos/depend Normal file
View File

@@ -0,0 +1,45 @@
emusd.o: emusd.c \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/stdint.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/features.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/compiler.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/linker.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/sys/cdefs.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/include/stddef.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/stdio.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/include/stdarg.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/bits/types.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/bits/stdio_lim.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/bits/mint_stdio.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/osbind.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/mint/osbind.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/mint/ostruct.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/mint/basepage.h \
cookie.h
cookie.o: cookie.c \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/stdint.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/features.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/compiler.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/linker.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/sys/cdefs.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/include/stddef.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/osbind.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/mint/osbind.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/mint/ostruct.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/mint/basepage.h
xhdi_test.o: xhdi_test.c \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/stdio.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/features.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/compiler.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/linker.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/sys/cdefs.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/include/stddef.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/include/stdarg.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/bits/types.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/bits/stdio_lim.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/bits/mint_stdio.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/stdint.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/osbind.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/mint/osbind.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/mint/ostruct.h \
/opt/cross-mint/lib/gcc/m68k-atari-mint/4.6.3/../../../../m68k-atari-mint/include/mint/basepage.h \
xhdi.h

View File

@@ -58,7 +58,7 @@
extern long xhdi_entrypoint;
#define CLOBBER_REGISTERS "memory" /* */
#define CLOBBER_REGISTERS "a0","memory" /* */
/* XHDI #0 */
#define XHGetVersion(xhdi_entry) \
@@ -77,7 +77,6 @@ __extension__ \
); \
retvalue; \
})
#define e_xhdi_version xhdi_version(xhdi_entrypoint)
/* XHDI #1 */
#define XHInqTarget(xhdi_entry, major, minor, block_size, flags, product_name) \
@@ -103,37 +102,35 @@ __extension__ \
[a_flags]"g"(flags), \
[a_product_name]"g"(product_name) \
: CLOBBER_REGISTERS /* clobbered regs */ \
AND_MEMORY \
); \
retvalue; \
})
/* XHDI #2 */
#define xhdi_reserve(xhdi_entry, major, minor, do_reserve, key) \
#define XHReserve(xhdi_entry, major, minor, do_reserve, key) \
__extension__ \
({ \
register long retvalue __asm__("d0"); \
\
__asm__ volatile( \
"move.w #XHDI_RESERVE,-(sp)\n\t" \
"move.w [major],-(sp)\n\t" \
"move.w [minor],-(sp)\n\t" \
"move.w [do_reserve],-(sp)\n\t" \
"move.w [key],-(sp)\n\t" \
"lea [xhdi_entry],a0\n\t" \
"jsr (a0)\n\t" \
"move.w %[a_key],-(sp)\n\t" \
"move.w %[a_do_reserve],-(sp)\n\t" \
"move.w %[a_minor],-(sp)\n\t" \
"move.w %[a_major],-(sp)\n\t" \
"move.w #2,-(sp)\n\t" \
"move.l %[entry],a0\n\t" \
"jsr (a0)\n\t" \
"lea 10(sp),sp\n\t" \
: "=r"(retvalue) /* outputs */ \
: [xhdi_entry]"g"(xhdi_entry), \
[major]"g"(major), \
[minor]"g"(minor), \
[do_reserve]"g"(do_reserve), \
[key]"g"(key), \
: [a_xhdi_entry]"g"(xhdi_entry), \
[a_major]"g"(major), \
[a_minor]"g"(minor), \
[a_do_reserve]"g"(do_reserve), \
[a_key]"g"(key) \
: CLOBBER_REGISTERS /* clobbered regs */ \
AND_MEMORY \
); \
retvalue; \
});
})
/* XHDI #3 */
#define XHLock(xhdi_entry, major, minor, do_lock, key) \
@@ -168,25 +165,24 @@ __extension__ \
register long retvalue __asm__("d0"); \
\
__asm__ volatile( \
"move.w #XHDI_STOP,-(sp)\n\t" \
"move.w [major],-(sp)\n\t" \
"move.w [minor],-(sp)\n\t" \
"move.w [do_stop],-(sp)\n\t" \
"move.w [key],-(sp)\n\t" \
"move.w %[a_key],-(sp)\n\t" \
"move.w %[a_do_stop],-(sp)\n\t" \
"move.w %[a_minor],-(sp)\n\t" \
"move.w %[a_major],-(sp)\n\t" \
"move.w #4,-(sp)\n\t" \
"lea %[entry],a0\n\t" \
"jsr (a0)\n\t" \
"lea 10(sp),sp\n\t" \
: "=r"(retvalue) /* outputs */ \
: [xhdi_entry]"g"(xhdi_entry), \
[major]"g"(major), \
[minor]"g"(minor), \
[do_stop]"g"(do_stop), \
[key]"g"(key), \
: [entry]"g"(xhdi_entry), \
[a_major]"g"(major), \
[a_minor]"g"(minor), \
[a_do_stop]"g"(do_stop), \
[a_key]"g"(key) \
: CLOBBER_REGISTERS /* clobbered regs */ \
AND_MEMORY \
); \
retvalue; \
});
})
/* XHDI #5 */
#define XHEject(xhdi_entry, major, minor, do_eject, key) \
@@ -262,107 +258,105 @@ __extension__ \
})
/* XHDI #8 */
#define xhdi_inquire_driver(xhdi_entry, bios_device, name, version, company, ahdi_version, max_ipl) \
#define XHInqDriver(xhdi_entry, bios_device, name, version, company, ahdi_version, max_ipl) \
__extension__ \
({ \
register long retvalue __asm__("d0"); \
\
__asm__ volatile( \
"move.w #XHDI_INQUIRE_DRIVER,-(sp)\n\t" \
"move.w [bios_device],-(sp)\n\t" \
"lea [name],-(sp)\n\t" \
"lea [version],-(sp)\n\t" \
"move.w [ahdi_version],-(sp)\n\t" \
"move.w [max_ipl],-(sp)\n\t" \
"lea %[entry],a0\n\t" \
"move.l %[a_max_ipl],-(sp)\n\t" \
"move.l %[a_ahdi_version],-(sp)\n\t" \
"move.l %[a_company],-(sp)\n\t" \
"move.l %[a_version],-(sp)\n\t" \
"move.l %[a_name],-(sp)\n\t" \
"move.w %[a_bios_device],-(sp)\n\t" \
"move.w #8,-(sp)\n\t" \
"move.l %[entry],a0\n\t" \
"jsr (a0)\n\t" \
"lea 16(sp),sp\n\t" \
: "=r"(retvalue) /* outputs */ \
: [xhdi_entry]"g"(xhdi_entry), \
[bios_device]"g"(bios_device), \
[name]"g"(name), \
[version]"g"(version), \
[company]"g"(company), \
[ahdi_version]"g"(ahdi_version), \
[max_ipl]"g"(max_ipl), \
: [entry]"g"(xhdi_entry), \
[a_bios_device]"g"(bios_device), \
[a_name]"g"(name), \
[a_version]"g"(version), \
[a_company]"g"(company), \
[a_ahdi_version]"g"(ahdi_version), \
[a_max_ipl]"g"(max_ipl), \
: CLOBBER_REGISTERS /* clobbered regs */ \
AND_MEMORY \
); \
retvalue; \
})
/* XHDI #9 */
#define xhdi_new_cookie(xhdi_entry, newcookie) \
#define XHNewCookie(xhdi_entry, newcookie) \
__extension__ \
({ \
register long retvalue __asm__("d0"); \
\
__asm__ volatile( \
"move.w #XHDI_NEW_COOKIE,-(sp)\n\t" \
"lea [newcookie],-(sp)\n\t" \
"lea %[entry],a0\n\t" \
"move.l %[a_newcookie],-(sp)\n\t" \
"move.w #9,-(sp)\n\t" \
"move.l %[entry],a0\n\t" \
"jsr (a0)\n\t" \
"addq.l #6,sp\n\t" \
: "=r"(retvalue) /* outputs */ \
: [newcookie]"g"(newcookie) /* inputs */ \
: [entry] "g" (xhdi_entry), \
[a_newcookie]"g"(newcookie) /* inputs */ \
: CLOBBER_REGISTERS /* clobbered regs */ \
AND_MEMORY \
); \
retvalue; \
})
#define e_xhdi_new_cookie xhdi_newcookie(xhdi_entrypoint)
/* XHDI #10 */
#define xhdi_read_write(xhdi_entry, major, minor, rwflag, recno, count, buf) \
#define XHReadWrite(xhdi_entry, major, minor, rwflag, recno, count, buf) \
__extension__ \
({ \
register long retvalue __asm__("d0"); \
\
__asm__ volatile( \
"move.w #XHDI_READ_WRITE,-(sp)\n\t" \
"move.w [major],-(sp)\n\t" \
"move.w [minor],-(sp)\n\t" \
"move.w [rwflag],-(sp)\n\t" \
"lea [recno],-(sp)\n\t" \
"move.w [count],-(sp)\n\t" \
"lea [buf],-(sp)\n\t" \
"lea %[entry],a0\n\t" \
"move.l %[a_buf],-(sp)\n\t" \
"move.w %[a_count],-(sp)\n\t" \
"move.l %[a_recno],-(sp)\n\t" \
"move.w %[a_rwflag],-(sp)\n\t" \
"move.w %[a_minor],-(sp)\n\t" \
"move.w %[a_major],-(sp)\n\t" \
"move.w #10,-(sp)\n\t" \
"move.l %[entry],a0\n\t" \
"jsr (a0)\n\t" \
"lea 18(sp),sp\n\t" \
: "=r"(retvalue) /* outputs */ \
: [xhdi_entry]"g"(xhdi_entry), \
[major]"g"(major), \
[minor]"g"(minor), \
[rwflag]"g"(rwflag) \
[recno]"g"(recno), \
[count]"g"(count), \
[buf]"g"(buf) \
: [entry]"g"(xhdi_entry), \
[a_major]"g"(major), \
[a_minor]"g"(minor), \
[a_rwflag]"g"(rwflag) \
[a_recno]"g"(recno), \
[a_count]"g"(count), \
[a_buf]"g"(buf) \
: CLOBBER_REGISTERS /* clobbered regs */ \
AND_MEMORY \
); \
retvalue; \
})
/* XHDI #11 */
#define xhdi_inquire_target2(xhdi_entry, major, minor, block_size, device_flags, product_name, stringlen) \
#define XHInqTarget2(xhdi_entry, major, minor, block_size, device_flags, product_name, stringlen) \
__extension__ \
({ \
register long retvalue __asm__("d0"); \
\
__asm__ volatile( \
"move.w #XHDI_INQUIRE_TARGET2,-(sp)\n\t"\
"move.w [major],-(sp)\n\t" \
"move.w [minor],-(sp)\n\t" \
"lea [block_size],-(sp)\n\t" \
"lea [recno],-(sp)\n\t" \
"lea [device_flags],-(sp)\n\t" \
"lea [product_name],-(sp)\n\t" \
"move.w [stringlen],-(sp)\n\t" \
"lea %[entry],a0\n\t" \
"move.w %[a_stringlen],-(sp)\n\t" \
"move.l %[a_product_name],-(sp)\n\t" \
"move.l %[a_device_flags],-(sp)\n\t" \
"move.l %[a_recno],-(sp)\n\t" \
"move.l %[a_block_size],-(sp)\n\t" \
"move.w %[a_minor],-(sp)\n\t" \
"move.w %[a_major],-(sp)\n\t" \
"move.w #11,-(sp)\n\t" \
"move.l %[entry],a0\n\t" \
"jsr (a0)\n\t" \
"lea 24(sp),sp\n\t" \
: "=r"(retvalue) /* outputs */ \
: [xhdi_entry]"g"(xhdi_entry), \
: [entry]"g"(xhdi_entry), \
[major]"g"(major), \
[minor]"g"(minor), \
[blocksize]"g"(blocksize) \
@@ -370,40 +364,38 @@ __extension__ \
[product_name]"g"(product_name), \
[stringlen]"g"(stringlen) \
: CLOBBER_REGISTERS /* clobbered regs */ \
AND_MEMORY \
); \
retvalue; \
})
/* XHDI #12 */
#define xhdi_inquire_device2(xhdi_entry, bios_device, major, minor, start_sector, bpb, blocks, partid) \
#define XHInqDev2(xhdi_entry, bios_device, major, minor, start_sector, bpb, blocks, partid) \
__extension__ \
({ \
register long retvalue __asm__("d0"); \
\
__asm__ volatile( \
"move.w #XHDI_DEVICE2,-(sp)\n\t" \
"move.w [bios_device],-(sp)\n\t" \
"lea [major],-(sp)\n\t" \
"lea [minor],-(sp)\n\t" \
"lea [start_sector],-(sp)\n\t" \
"lea [bpb],-(sp)\n\t" \
"lea [blocks],-(sp)\n\t" \
"lea [part_id],-(sp)\n\t" \
"lea %[entry],a0\n\t" \
"move.l %[a_part_id],-(sp)\n\t" \
"move.l %[a_blocks],-(sp)\n\t" \
"move.l %[a_bpb],-(sp)\n\t" \
"move.l %[a_start_sector],-(sp)\n\t" \
"move.l %[a_minor],-(sp)\n\t" \
"move.l %[a_major],-(sp)\n\t" \
"move.w %[a_bios_device],-(sp)\n\t" \
"move.w #12,-(sp)\n\t" \
"move.l %[entry],a0\n\t" \
"jsr (a0)\n\t" \
"lea 28(sp),sp\n\t" \
: "=r"(retvalue) /* outputs */ \
: [xhdi_entry]"g"(xhdi_entry), \
[bios_device]"g"(bios_device), \
[major]"g"(major), \
[minor]"g"(minor), \
[start_sector]"g"(start_sector) \
[bpb]"g"(bpb), \
[blocks]"g"(blocks), \
[partid]"g"(partid) \
: [entry]"g"(xhdi_entry), \
[a_bios_device]"g"(bios_device), \
[a_major]"g"(major), \
[a_minor]"g"(minor), \
[a_start_sector]"g"(start_sector) \
[a_bpb]"g"(bpb), \
[a_blocks]"g"(blocks), \
[a_partid]"g"(partid) \
: CLOBBER_REGISTERS /* clobbered regs */ \
AND_MEMORY \
); \
retvalue; \
})