Commit 49a885f

Nick committed on
WIP debugging stuff for the new driver setup
commit 49a885ffafb250f633b141b39d43bdb302e75106 parent 4f379f8
4 changed files +27−7
ModifiedCpu/z80cpu.pas +1−2
@@ -99,7 +99,6 @@ end;
99 function ld_xxxx_sp: byte; 99 function ld_xxxx_sp: byte;
100 begin 100 begin
101 {TODO} 101 {TODO}
102
103 Result := 20; 102 Result := 20;
104 end; 103 end;
105 104
@@ -1798,7 +1797,7 @@ end;
1798 function dd_debug: byte; 1797 function dd_debug: byte;
1799 begin 1798 begin
1800 writeln('DEBUG: ', speekb(pc.w)); 1799 writeln('DEBUG: ', speekb(pc.w));
1801 //readln; 1800 readln;
1802 Inc(pc.w); 1801 Inc(pc.w);
1803 Result := 0; 1802 Result := 0;
1804 end; 1803 end;
Modifiedcodegen.pas +20−3
@@ -258,8 +258,22 @@ begin
258 258
259 Proc.Executable := 'rgbasm'; 259 Proc.Executable := 'rgbasm';
260 Proc.Parameters.Clear; 260 Proc.Parameters.Clear;
261 Proc.Parameters.add('-o'+Filename+'.obj'); 261 Proc.Parameters.add('-o'+Filename+'_driver.obj');
262 Proc.Parameters.add('driverLite.z80'); 262 Proc.Parameters.add('driver.z80');
263 Proc.Execute;
264 if Proc.ExitCode <> 0 then goto AssemblyError;
265
266 Proc.Executable := 'rgbasm';
267 Proc.Parameters.Clear;
268 Proc.Parameters.add('-o'+Filename+'_song.obj');
269 Proc.Parameters.add('song.z80');
270 Proc.Execute;
271 if Proc.ExitCode <> 0 then goto AssemblyError;
272
273 Proc.Executable := 'rgbasm';
274 Proc.Parameters.Clear;
275 Proc.Parameters.add('-o'+Filename+'_player.obj');
276 Proc.Parameters.add('player.z80');
263 Proc.Execute; 277 Proc.Execute;
264 if Proc.ExitCode <> 0 then goto AssemblyError; 278 if Proc.ExitCode <> 0 then goto AssemblyError;
265 279
@@ -271,7 +285,10 @@ begin
271 Proc.Parameters.add('-o'+Filename+'.gbs') 285 Proc.Parameters.add('-o'+Filename+'.gbs')
272 else 286 else
273 Proc.Parameters.add('-o'+Filename+'.gb'); 287 Proc.Parameters.add('-o'+Filename+'.gb');
274 Proc.Parameters.add(Filename+'.obj'); 288 Proc.Parameters.add('-p0xDD');
289 Proc.Parameters.add(Filename+'_driver.obj');
290 Proc.Parameters.add(Filename+'_song.obj');
291 Proc.Parameters.add(Filename+'_player.obj');
275 Proc.Execute; 292 Proc.Execute;
276 if Proc.ExitCode <> 0 then goto AssemblyError; 293 if Proc.ExitCode <> 0 then goto AssemblyError;
277 294
ModifiedhUGEDriver +1−1
@@ -1 +1 @@
1 Subproject commit 73749cdf640140cad6103199b938307a5462fa44 1 Subproject commit 4d704a8d0aff369c0219aee67657d969302611ca
Modifiedmainloop.pas +5−1
@@ -303,7 +303,11 @@ begin
303 Inc(pc.w); 303 Inc(pc.w);
304 end; 304 end;
305 305
306 Count := z80[code](); 306 if romname[2] = 'U' then begin
307 //writeln('op: ', code);
308 Count := z80[code]();
309 end else Count := z80[code]();
310
307 SoundUpdate(Count * (3 - gb_speed)); 311 SoundUpdate(Count * (3 - gb_speed));
308 cnumber := Count div gb_speed; 312 cnumber := Count div gb_speed;
309 313