JailDoctor/paco
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ara pilla el .BAS de la linea de comandos. Arreglada release version de Windows

Browse Source
This commit is contained in:
Raimon Zamora
2017-02-24 19:00:09 +01:00
parent bf91b632bd
commit cf4625d6f7
3 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main.cpp
View File

@@ -39,20 +39,30 @@ unsigned char input_data_out() {
int main(int argc, char** argv) { int main(int argc, char** argv) {
vm_init("test.bas"); // Inicialitzar la m<>quina virtual (li arriba el arxiu amb el programa per linea de comandos)
vm_init(argc < 2 ? nullptr : argv[1]); // "test.bas"
// Inicialitzar el procesador gr<67>fic
vdp_init(); vdp_init();
// Registrar els ports d'entrada i eixida del procesador gr<67>fic
vm_register_out_port(10, vdp_data_out); vm_register_out_port(10, vdp_data_out);
vm_register_out_port(11, vdp_cmd_out); vm_register_out_port(11, vdp_cmd_out);
vm_register_in_port(12, vdp_in); vm_register_in_port(12, vdp_in);
// Registrar els ports d'entrada i eixida del dispositiu d'entrada (teclat, en cas del emu)
vm_register_out_port(20, input_data_in); vm_register_out_port(20, input_data_in);
vm_register_in_port(21, input_data_out); vm_register_in_port(21, input_data_out);
// Inicialitzar el procesador de s<>
sound_init(); sound_init();
// Registrar els ports d'entrada i eixida del procesador de s<>
vm_register_out_port(30, sound_data_out); vm_register_out_port(30, sound_data_out);
vm_register_out_port(31, sound_cmd_out); vm_register_out_port(31, sound_cmd_out);
vm_register_in_port(32, sound_in); vm_register_in_port(32, sound_in);
// Inicialitzem el depurador del emulador
debug_init(vm_get_memory()); debug_init(vm_get_memory());
const bool* breakpoints = debug_get_breakpoints(); const bool* breakpoints = debug_get_breakpoints();

3
paco.vcxproj
View File

@@ -46,6 +46,8 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<IncludePath>C:\dev\lib\sdl2\include;$(IncludePath)</IncludePath>
<LibraryPath>C:\dev\lib\sdl2\lib\x86;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
@@ -76,6 +78,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>

35
vm.cpp
View File

@@ -48,28 +48,33 @@ static void load_rom() {
} }
static void load_program(const char* filename) { static void load_program(const char* filename) {
FILE *f = fopen(filename, "rb"); if (filename == nullptr) {
fseek(f, 0, SEEK_END); error_raise("No file specified");
long fsize = ftell(f); } else {
fseek(f, 0, SEEK_SET); //same as rewind(f); FILE *f = fopen(filename, "rb");
char *program = (char*)malloc(fsize + 1); if (f == nullptr) {
fread(program, fsize, 1, f); error_raise("File not found");
fclose(f); } else {
program[fsize] = 0; fseek(f, 0, SEEK_END);
long fsize = ftell(f);
fseek(f, 0, SEEK_SET); //same as rewind(f);
char *program = (char*)malloc(fsize + 1);
fread(program, fsize, 1, f);
fclose(f);
program[fsize] = 0;
register_constants(); register_constants();
parser_parse(program, mem); parser_parse(program, mem);
free(program); free(program);
}
}
if (error_raised()) { if (error_raised()) {
vm_pc = 0xA000; vm_pc = 0xA000;
//error_print(&mem[0xA000]); } else {
}
else {
printf("Compilation complete!\nProgram size: %d bytes\nMemory usage: %d bytes\n", parser_get_codesize(), parser_get_memory_usage()); printf("Compilation complete!\nProgram size: %d bytes\nMemory usage: %d bytes\n", parser_get_codesize(), parser_get_memory_usage());
/*FILE *f = fopen("test.bin", "wb"); /*FILE *f = fopen("test.bin", "wb");
if (f == nullptr) perror("Error");// printf("Error: %d (%s)\n", errno, strerror(errno));
fwrite(rawCode, parser_get_codesize(), 1, f); fwrite(rawCode, parser_get_codesize(), 1, f);
fclose(f);*/ fclose(f);*/
} }