Commit 8f6d3c74 authored by Ronny Wichers Schreur's avatar Ronny Wichers Schreur

made driver Windows compatible, async update is not tested

parent 5772698d
......@@ -338,7 +338,6 @@ step intr (DComp force dircache (Async [] max_n_processes n_used_processors NoUn
# ps = showInfo (Level1 "Generating...") ps
# (paths,ds) = ds!modpaths
= step intr (DGene paths (ASyncCodeGeneration [] max_n_processes NoUnknownFinishedProcessors) ds) ps
/*
step intr (DComp force dircache (AsyncWin _ []) Nil ds) ps
// compile phase finished: remove all modules not (indirectly) imported by main module
# project = PR_SetBuilt ds.modpaths ds.project // removes unused modules
......@@ -348,7 +347,7 @@ step intr (DComp force dircache (AsyncWin _ []) Nil ds) ps
# ps = showInfo (Level1 "Generating...") ps
# (paths,ds) = ds!modpaths
= step intr (DGene paths SyncCodeGeneration ds) ps
*/
step intr state=:(DComp force _ (Async _ _ _ _) _ _) ps
# ps = traceInfo (Level3 ["check_completed..."]) ps
# (state, ps) = check_completed state ps
......
......@@ -20,3 +20,5 @@ PrefsDir :: String
batchOptions :: !*World -> (!Bool,Bool,String,*File,!*World)
wAbort :: !String !*World -> *World
pAbort :: !(PSt .a) -> PSt .a
onOSX :: Bool
\ No newline at end of file
......@@ -233,3 +233,6 @@ WinGetModulePath
.end
}
onOSX :: Bool
onOSX
= False
\ No newline at end of file
......@@ -8,12 +8,12 @@ import UtilStrictLists
import PmCompilerOptions
import PmTypes
standardStaticLibraries :: !LinkMethod -> List String
standardObjectFiles :: !Bool !Bool -> List String
standardStaticLibraries :: !Processor !LinkMethod -> List String
standardObjectFiles :: !Bool !Bool !Processor -> List String
getLibs :: ![String] !*Files -> (!(![String],![String]),!*Files)
ClearCompilerCache :: !.a -> (!Int,!.a)
ClearCompilerCache :: !String !String !.a -> (!Int,!.a)
QuitCleanCompiler :: !*(IOSt .l) -> *(IOSt .l)
//:: CompileClearCache = ClearCache | Don`tClearCache
......@@ -67,6 +67,7 @@ CodeGen :: // Generates code for the given file:
!Pathname // full .abc pathname of module to be compiled
!Bool // time profiling...
!CodeGenOptions // code generator options
!Processor // target processor
!ApplicationOptions // application options
!Pathname // startup directory
!*(PSt .l) // state
......@@ -99,6 +100,7 @@ Link :: // Links the given file:
!String // name of file containing symbols to be exported from dll
!Pathname // startup directory
!String // path to dynamic linker
!Processor // target processor
!*(PSt .l) // state
->
( !*(PSt .l) // state
......@@ -173,6 +175,6 @@ CompilePersistent ::
-> (!*CompilingInfo,!(!*env, !Pathname, !CompilerMsg))
| FileEnv env
//ClearCompilerCaches :: !Int !.a -> (!Int,!.a)
//StartCodeGenerator :: !String !(WindowFun *(PSt .l)) !CodeGenerateAsmOrCode !Pathname !Int !Bool !CodeGenOptions !ApplicationOptions !Pathname !*(PSt .l) -> (!Bool,!Pathname,!*(PSt .l))
//SendRepeatResult :: !Int !.a -> (!Int,!.a)
ClearCompilerCaches :: !Int !.a -> (!Int,!.a)
StartCodeGenerator :: !String !(WindowFun *(PSt .l)) !CodeGenerateAsmOrCode !Pathname !Int !Bool !CodeGenOptions !Processor !ApplicationOptions !Pathname !*(PSt .l) -> (!Bool,!Pathname,!*(PSt .l))
SendRepeatResult :: !Int !.a -> (!Int,!.a)
......@@ -29,8 +29,8 @@ tooltempdir =: trace_n ("Tooltempdir",TempDir) TempDir
//--
// kernel_library is required by the _system _startup combo and should be encoded there
standardStaticLibraries :: !LinkMethod -> List String
standardStaticLibraries method
standardStaticLibraries :: !Processor !LinkMethod -> List String
standardStaticLibraries _ method
= case method of
LM_Static -> ("kernel_library" :! morelibs)
LM_Dynamic -> ("kernel_library" :! "StaticClientChannel_library" :! morelibs)
......@@ -41,8 +41,8 @@ standardStaticLibraries method
morelibs // Note that these dependencies are introduced by StdEnv and should be encoded there.
= "user_library" :! "gdi_library" :! "comdlg_library" :! Nil
standardObjectFiles :: !Bool !Bool -> List String
standardObjectFiles stack_traces profiling
standardObjectFiles :: !Bool !Bool !Processor-> List String
standardObjectFiles stack_traces profiling _
| stack_traces
= ("_startup0.o" :! "_startup1Trace.o" :! "_startup2.o" :! "_system.o" :! Nil)
| profiling
......@@ -66,8 +66,8 @@ getLib lib files
//--
ClearCompilerCache :: !.a -> (!Int,!.a)
ClearCompilerCache ps = (0,ps)
ClearCompilerCache :: !String !String !.a -> (!Int,!.a)
ClearCompilerCache _ _ ps = (0,ps)
QuitCleanCompiler :: !*(IOSt .l) -> *(IOSt .l)
QuitCleanCompiler io = io
......@@ -468,9 +468,10 @@ where
= escape_specials (i+2) (string % (0,i-1)+++"\\"+++string % (i,dec (size string)))
= escape_specials (inc i) string
CodeGen :: !String !(WindowFun *(PSt .l)) !CodeGenerateAsmOrCode !Pathname !Bool !CodeGenOptions !ApplicationOptions !Pathname !*(PSt .l)
CodeGen :: !String !(WindowFun *(PSt .l)) !CodeGenerateAsmOrCode !Pathname !Bool
!CodeGenOptions !Processor !ApplicationOptions !Pathname !*(PSt .l)
-> (!*(PSt .l), !Pathname, !Bool)
CodeGen cgen` wf genAsmOrCode path timeprofile cgo=:{tp} ao startupdir ps
CodeGen cgen` wf genAsmOrCode path timeprofile cgo tp ao startupdir ps
# (cgen_ok,cgen,cgendir) = mangleGenerator cgen` startupdir
| not cgen_ok
# ps = wf [cgen] ps
......@@ -478,7 +479,7 @@ CodeGen cgen` wf genAsmOrCode path timeprofile cgo=:{tp} ao startupdir ps
# objpath = MakeObjSystemPathname tp path
path_without_suffix = RemoveSuffix path
command = cgen +++ MakeCodeGenOptionsString genAsmOrCode timeprofile cgo
command = cgen +++ MakeCodeGenOptionsString genAsmOrCode timeprofile cgo tp
// +++ " " +++ (watcom_quoted_string path_without_suffix)
+++ " " +++ (quoted_string path_without_suffix)
......@@ -512,7 +513,7 @@ mangleGenerator cgen` startupdir
# cgendir = RemoveFilename (cgen % (0, size cgen - 2))
= (True,cgencom,cgendir)
MakeCodeGenOptionsString genAsmOrCode timeprofile {ci,cs,tp}
MakeCodeGenOptionsString genAsmOrCode timeprofile {ci,cs} tp
= checkindex+++checkstack+++genasm
where
checkindex | ci = " -ci"; = ""
......@@ -526,12 +527,12 @@ where
Link :: !String !(WindowFun *(PSt .l)) !Pathname !ApplicationOptions
!Pathname !(List Pathname) !(List Pathname) !(List Pathname) !Bool !Bool !Bool !Bool !String
!Bool !String !Pathname !String !*(PSt .l)
!Bool !String !Pathname !String !Processor !*(PSt .l)
-> (!*(PSt .l),!Bool)
Link linker` winfun path
applicationOptions=:{ss,hs,initial_heap_size,profiling,heap_size_multiple,o,memoryProfilingMinimumHeapSize=minheap}
optionspathname library_file_names object_file_names static_libraries static gen_relocs gen_linkmap
link_resources resource_path gen_dll dll_syms startupdir dynlstr ps
link_resources resource_path gen_dll dll_syms startupdir dynlstr _ ps
# (ok,linker,linkerdir) = mangleLinker linker` startupdir
| not ok
# ps = winfun [linker] ps
......@@ -768,8 +769,8 @@ compile_with_cache2 path directory arguments compiler_thread_id compiler_thread_
ClearCompilerCaches :: !Int !.a -> (!Int,!.a)
ClearCompilerCaches _ _ = undef
StartCodeGenerator :: !String !(WindowFun *(PSt .l)) !CodeGenerateAsmOrCode !Pathname !Int !Bool !CodeGenOptions !ApplicationOptions !Pathname !*(PSt .l) -> (!Bool,!Pathname,!*(PSt .l))
StartCodeGenerator _ _ _ _ _ _ _ _ _ _ = undef
StartCodeGenerator :: !String !(WindowFun *(PSt .l)) !CodeGenerateAsmOrCode !Pathname !Int !Bool !CodeGenOptions !Processor !ApplicationOptions !Pathname !*(PSt .l) -> (!Bool,!Pathname,!*(PSt .l))
StartCodeGenerator _ _ _ _ _ _ _ _ _ _ _ = undef
SendRepeatResult :: !Int !.a -> (!Int,!.a)
SendRepeatResult _ _ = undef
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment