StartAssembler now works for z80 / m68k

leuat · Jan 1, 2025 · 408bf61 · 408bf61
1 parent 1b9ab49
commit 408bf61
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/Publish/tutorials/AMIGA/tutorials/01_image.ras b/Publish/tutorials/AMIGA/tutorials/01_image.ras
@@ -2,6 +2,7 @@ program Image;
 @use "graphics"
 var  
 
+
 /*
 
 	This example initialises a 320x256 16-color image

diff --git a/Publish/tutorials/AMSTRADCPC/tutorials/tut1.ras b/Publish/tutorials/AMSTRADCPC/tutorials/tut1.ras
@@ -26,8 +26,6 @@ var
 	image : incbin("resources/images/trse.bin");
 	palette : incbin("resources/images/trse_palette.bin");
 	
-	
-	
 begin
 	
 	// Set 160x200 16-color mode

diff --git a/source/Compiler/compilers/compilerm68k.cpp b/source/Compiler/compilers/compilerm68k.cpp
@@ -6,6 +6,7 @@ void CompilerM68K::InitAssemblerAnddispatcher(QSharedPointer<AbstractSystem> sys
     m_assembler = QSharedPointer<Asm68000>(new Asm68000());//
     m_codeGen = QSharedPointer<CodeGen68k>(new CodeGen68k());
     m_codeGen->dontOutputLineNumbers();
+    m_assembler->m_source <<m_parser.m_initAssembler;
 
     if (Data::data.demomode)
         Syntax::s.m_currentSystem->m_systemParams["ignoresystemheaders"]=(char)1;

diff --git a/source/Compiler/compilers/compilerz80.cpp b/source/Compiler/compilers/compilerz80.cpp
@@ -7,6 +7,9 @@ void CompilerZ80::InitAssemblerAnddispatcher(QSharedPointer<AbstractSystem> syst
     m_codeGen = QSharedPointer<CodeGenZ80>(new CodeGenZ80());
     m_codeGen->dontOutputLineNumbers();
 
+    m_assembler->m_startInsertAssembler << m_parser.m_initAssembler;
+
+
     if (m_projectIni->getdouble("override_target_settings")==1) {
         Syntax::s.m_currentSystem->m_programStartAddress = Util::NumberFromStringHex(m_projectIni->getString("override_target_settings_org"));
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ program Image; @@
     @use "graphics"
     var
     /*
     	This example initialises a 320x256 16-color image
@@ Expand Down @@