Skip to content

Commit

Permalink
changed core:target-backend-pathname and core:get-pathname-with-type …
Browse files Browse the repository at this point in the history
…so that they will work better on linux
  • Loading branch information
drmeister committed Jun 24, 2015
1 parent 5361029 commit d38da88
Show file tree
Hide file tree
Showing 5 changed files with 260 additions and 214 deletions.
231 changes: 116 additions & 115 deletions src/lisp/kernel/cleavir-system.lsp
Original file line number Diff line number Diff line change
Expand Up @@ -34,120 +34,121 @@
#P"/kernel/clos/conditions" #P"/kernel/clos/print" #P"/kernel/clos/streams"
#P"/kernel/lsp/pprint" #P"/kernel/clos/inspect" :CLOS #P"/kernel/lsp/ffi"
#P"/sockets/sockets" :FRONT #P"/kernel/lsp/top" :ALL :BCLASP
|kernel/contrib/sicl/Code/Cleavir/Input-output/packages|
|kernel/contrib/sicl/Code/Cleavir/Input-output/io|
|kernel/contrib/sicl/Code/Cleavir/Meter/packages|
|kernel/contrib/sicl/Code/Cleavir/Meter/meter|
|kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/packages|
|kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/general-purpose-asts|
|kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/fixnum-related-asts|
|kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/float-related-asts|
|kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/cons-related-asts|
|kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/standard-object-related-asts|
|kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/array-related-asts|
|kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/graphviz-drawing|
|kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/map-ast|
|kernel/contrib/sicl/Code/Cleavir/AST-transformations/packages|
|kernel/contrib/sicl/Code/Cleavir/AST-transformations/clone|
|kernel/contrib/sicl/Code/Cleavir/AST-transformations/replace|
|kernel/contrib/sicl/Code/Cleavir/AST-transformations/hoist-load-time-value|
|kernel/contrib/sicl/Code/Cleavir/Primop/packages|
|kernel/contrib/sicl/Code/Cleavir/Internationalization/packages|
|kernel/contrib/sicl/Code/Cleavir/Internationalization/locale|
|kernel/contrib/sicl/Code/Cleavir/Internationalization/date|
|kernel/contrib/sicl/Code/Cleavir/Internationalization/language|
|kernel/contrib/sicl/Code/Cleavir/Internationalization/language-english|
|kernel/contrib/sicl/Code/Cleavir/Internationalization/language-francais|
|kernel/contrib/sicl/Code/Cleavir/Internationalization/condition|
|kernel/contrib/sicl/Code/Cleavir/Internationalization/init|
|kernel/contrib/sicl/Code/Cleavir/Code-utilities/packages|
|kernel/contrib/sicl/Code/Cleavir/Code-utilities/conditions|
|kernel/contrib/sicl/Code/Cleavir/Code-utilities/condition-reporters-english|
|kernel/contrib/sicl/Code/Cleavir/Code-utilities/argcount|
|kernel/contrib/sicl/Code/Cleavir/Code-utilities/form|
|kernel/contrib/sicl/Code/Cleavir/Code-utilities/list-structure|
|kernel/contrib/sicl/Code/Cleavir/Code-utilities/declarations|
|kernel/contrib/sicl/Code/Cleavir/Code-utilities/lambda-lists|
|kernel/contrib/sicl/Code/Cleavir/Code-utilities/destructuring|
|kernel/contrib/sicl/Code/Cleavir/Environment/packages|
|kernel/contrib/sicl/Code/Cleavir/Environment/conditions|
|kernel/contrib/sicl/Code/Cleavir/Environment/condition-reporters-english|
|kernel/contrib/sicl/Code/Cleavir/Environment/query|
|kernel/contrib/sicl/Code/Cleavir/Environment/augmentation-functions|
|kernel/contrib/sicl/Code/Cleavir/Environment/default-augmentation-classes|
|kernel/contrib/sicl/Code/Cleavir/Environment/default-info-methods|
|kernel/contrib/sicl/Code/Cleavir/Environment/eval|
|kernel/contrib/sicl/Code/Cleavir/Generate-AST/packages|
|kernel/contrib/sicl/Code/Cleavir/Generate-AST/conditions|
|kernel/contrib/sicl/Code/Cleavir/Generate-AST/condition-reporters-english|
|kernel/contrib/sicl/Code/Cleavir/Generate-AST/source-tracking|
|kernel/contrib/sicl/Code/Cleavir/Generate-AST/check-special-form-syntax|
|kernel/contrib/sicl/Code/Cleavir/Generate-AST/environment-query|
|kernel/contrib/sicl/Code/Cleavir/Generate-AST/utilities|
|kernel/contrib/sicl/Code/Cleavir/Generate-AST/minimal-compilation|
|kernel/contrib/sicl/Code/Cleavir/Generate-AST/generate-ast|
|kernel/contrib/sicl/Code/Cleavir/Generate-AST/convert-form|
|kernel/contrib/sicl/Code/Cleavir/Generate-AST/convert-special|
|kernel/contrib/sicl/Code/Cleavir/Generate-AST/convert-primop|
|kernel/contrib/sicl/Code/Cleavir/Generate-AST/ast-from-file|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/packages|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/datum|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/instruction|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/graph-modifications|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/instruction-mixin-classes|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/graphviz-drawing|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/map-instructions-arbitrary-order|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/set-predecessors|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/map-instructions|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/data|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/box-unbox-mixins|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/side-effect-mixins|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/general-purpose-instructions|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/fixnum-related-instructions|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/integer-related-instructions|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/float-related-instructions|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/cons-related-instructions|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/standard-object-related-instructions|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/array-related-instructions|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/multiple-value-related-instructions|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/environment-related-instructions|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/graphviz-drawing|
|kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/packages|
|kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/context|
|kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/compile-general-purpose-asts|
|kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/compile-fixnum-related-asts|
|kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/compile-float-related-asts|
|kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/compile-cons-related-asts|
|kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/compile-standard-object-related-asts|
|kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/compile-array-related-asts|
|kernel/contrib/sicl/Code/Cleavir/HIR-transformations/packages|
|kernel/contrib/sicl/Code/Cleavir/HIR-transformations/traverse|
|kernel/contrib/sicl/Code/Cleavir/HIR-transformations/inline-calls|
|kernel/contrib/sicl/Code/Cleavir/HIR-transformations/static-few-assignments|
|kernel/contrib/sicl/Code/Cleavir/HIR-transformations/type-inference|
|kernel/contrib/sicl/Code/Cleavir/HIR-transformations/eliminate-typeq|
|kernel/contrib/sicl/Code/Cleavir/HIR-transformations/simplify-box-unbox|
|kernel/contrib/sicl/Code/Cleavir/HIR-transformations/segregate-lexicals|
|kernel/contrib/sicl/Code/Cleavir/HIR-transformations/eliminate-superfluous-temporaries|
|kernel/contrib/sicl/Code/Cleavir/HIR-transformations/hir-transformations|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/MIR/general|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/MIR/graphviz-drawing|
|kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR-to-MIR/general|
|kernel/contrib/sicl/Code/Cleavir/Utilities/packages|
|kernel/contrib/sicl/Code/Cleavir/Utilities/utilities|
|kernel/contrib/sicl/Code/Cleavir/Basic-blocks/packages|
|kernel/contrib/sicl/Code/Cleavir/Basic-blocks/basic-blocks|
|kernel/contrib/sicl/Code/Types/Additional/packages|
|kernel/contrib/sicl/Code/Types/Additional/types|
|kernel/contrib/sicl/Code/Conditions/Additional/packages|
|kernel/contrib/sicl/Code/Conditions/Additional/conditions|
|kernel/contrib/sicl/Code/Conditions/Additional/condition-reporters-en|
|kernel/cleavir/packages| |kernel/cleavir/system| |kernel/cleavir/ast|
|kernel/cleavir/convert-form| |kernel/cleavir/convert-special|
|kernel/cleavir/hir| |kernel/cleavir/introduce-invoke|
|kernel/cleavir/setup| |kernel/cleavir/ast-to-hir| |kernel/cleavir/mir|
|kernel/cleavir/hir-to-mir| |kernel/cleavir/ir|
|kernel/cleavir/gml-drawing| |kernel/cleavir/landing-pad|
|kernel/cleavir/arguments| |kernel/cleavir/translate| :CLEAVIR-CLASP
#P"kernel/contrib/sicl/Code/Cleavir/Input-output/packages"
#P"kernel/contrib/sicl/Code/Cleavir/Input-output/io"
#P"kernel/contrib/sicl/Code/Cleavir/Meter/packages"
#P"kernel/contrib/sicl/Code/Cleavir/Meter/meter"
#P"kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/packages"
#P"kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/general-purpose-asts"
#P"kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/fixnum-related-asts"
#P"kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/float-related-asts"
#P"kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/cons-related-asts"
#P"kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/standard-object-related-asts"
#P"kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/array-related-asts"
#P"kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/graphviz-drawing"
#P"kernel/contrib/sicl/Code/Cleavir/Abstract-syntax-tree/map-ast"
#P"kernel/contrib/sicl/Code/Cleavir/AST-transformations/packages"
#P"kernel/contrib/sicl/Code/Cleavir/AST-transformations/clone"
#P"kernel/contrib/sicl/Code/Cleavir/AST-transformations/replace"
#P"kernel/contrib/sicl/Code/Cleavir/AST-transformations/hoist-load-time-value"
#P"kernel/contrib/sicl/Code/Cleavir/Primop/packages"
#P"kernel/contrib/sicl/Code/Cleavir/Internationalization/packages"
#P"kernel/contrib/sicl/Code/Cleavir/Internationalization/locale"
#P"kernel/contrib/sicl/Code/Cleavir/Internationalization/date"
#P"kernel/contrib/sicl/Code/Cleavir/Internationalization/language"
#P"kernel/contrib/sicl/Code/Cleavir/Internationalization/language-english"
#P"kernel/contrib/sicl/Code/Cleavir/Internationalization/language-francais"
#P"kernel/contrib/sicl/Code/Cleavir/Internationalization/condition"
#P"kernel/contrib/sicl/Code/Cleavir/Internationalization/init"
#P"kernel/contrib/sicl/Code/Cleavir/Code-utilities/packages"
#P"kernel/contrib/sicl/Code/Cleavir/Code-utilities/conditions"
#P"kernel/contrib/sicl/Code/Cleavir/Code-utilities/condition-reporters-english"
#P"kernel/contrib/sicl/Code/Cleavir/Code-utilities/argcount"
#P"kernel/contrib/sicl/Code/Cleavir/Code-utilities/form"
#P"kernel/contrib/sicl/Code/Cleavir/Code-utilities/list-structure"
#P"kernel/contrib/sicl/Code/Cleavir/Code-utilities/declarations"
#P"kernel/contrib/sicl/Code/Cleavir/Code-utilities/lambda-lists"
#P"kernel/contrib/sicl/Code/Cleavir/Code-utilities/destructuring"
#P"kernel/contrib/sicl/Code/Cleavir/Environment/packages"
#P"kernel/contrib/sicl/Code/Cleavir/Environment/conditions"
#P"kernel/contrib/sicl/Code/Cleavir/Environment/condition-reporters-english"
#P"kernel/contrib/sicl/Code/Cleavir/Environment/query"
#P"kernel/contrib/sicl/Code/Cleavir/Environment/augmentation-functions"
#P"kernel/contrib/sicl/Code/Cleavir/Environment/default-augmentation-classes"
#P"kernel/contrib/sicl/Code/Cleavir/Environment/default-info-methods"
#P"kernel/contrib/sicl/Code/Cleavir/Environment/eval"
#P"kernel/contrib/sicl/Code/Cleavir/Generate-AST/packages"
#P"kernel/contrib/sicl/Code/Cleavir/Generate-AST/conditions"
#P"kernel/contrib/sicl/Code/Cleavir/Generate-AST/condition-reporters-english"
#P"kernel/contrib/sicl/Code/Cleavir/Generate-AST/source-tracking"
#P"kernel/contrib/sicl/Code/Cleavir/Generate-AST/check-special-form-syntax"
#P"kernel/contrib/sicl/Code/Cleavir/Generate-AST/environment-query"
#P"kernel/contrib/sicl/Code/Cleavir/Generate-AST/utilities"
#P"kernel/contrib/sicl/Code/Cleavir/Generate-AST/minimal-compilation"
#P"kernel/contrib/sicl/Code/Cleavir/Generate-AST/generate-ast"
#P"kernel/contrib/sicl/Code/Cleavir/Generate-AST/convert-form"
#P"kernel/contrib/sicl/Code/Cleavir/Generate-AST/convert-special"
#P"kernel/contrib/sicl/Code/Cleavir/Generate-AST/convert-primop"
#P"kernel/contrib/sicl/Code/Cleavir/Generate-AST/ast-from-file"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/packages"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/datum"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/instruction"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/graph-modifications"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/instruction-mixin-classes"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/graphviz-drawing"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/map-instructions-arbitrary-order"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/set-predecessors"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/map-instructions"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/data"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/box-unbox-mixins"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/side-effect-mixins"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/general-purpose-instructions"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/fixnum-related-instructions"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/integer-related-instructions"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/float-related-instructions"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/cons-related-instructions"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/standard-object-related-instructions"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/array-related-instructions"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/multiple-value-related-instructions"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/environment-related-instructions"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR/graphviz-drawing"
#P"kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/packages"
#P"kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/context"
#P"kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/compile-general-purpose-asts"
#P"kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/compile-fixnum-related-asts"
#P"kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/compile-float-related-asts"
#P"kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/compile-cons-related-asts"
#P"kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/compile-standard-object-related-asts"
#P"kernel/contrib/sicl/Code/Cleavir/AST-to-HIR/compile-array-related-asts"
#P"kernel/contrib/sicl/Code/Cleavir/HIR-transformations/packages"
#P"kernel/contrib/sicl/Code/Cleavir/HIR-transformations/traverse"
#P"kernel/contrib/sicl/Code/Cleavir/HIR-transformations/inline-calls"
#P"kernel/contrib/sicl/Code/Cleavir/HIR-transformations/static-few-assignments"
#P"kernel/contrib/sicl/Code/Cleavir/HIR-transformations/type-inference"
#P"kernel/contrib/sicl/Code/Cleavir/HIR-transformations/eliminate-typeq"
#P"kernel/contrib/sicl/Code/Cleavir/HIR-transformations/simplify-box-unbox"
#P"kernel/contrib/sicl/Code/Cleavir/HIR-transformations/segregate-lexicals"
#P"kernel/contrib/sicl/Code/Cleavir/HIR-transformations/eliminate-superfluous-temporaries"
#P"kernel/contrib/sicl/Code/Cleavir/HIR-transformations/hir-transformations"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/MIR/general"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/MIR/graphviz-drawing"
#P"kernel/contrib/sicl/Code/Cleavir/Intermediate-representation/HIR-to-MIR/general"
#P"kernel/contrib/sicl/Code/Cleavir/Utilities/packages"
#P"kernel/contrib/sicl/Code/Cleavir/Utilities/utilities"
#P"kernel/contrib/sicl/Code/Cleavir/Basic-blocks/packages"
#P"kernel/contrib/sicl/Code/Cleavir/Basic-blocks/basic-blocks"
#P"kernel/contrib/sicl/Code/Types/Additional/packages"
#P"kernel/contrib/sicl/Code/Types/Additional/types"
#P"kernel/contrib/sicl/Code/Conditions/Additional/packages"
#P"kernel/contrib/sicl/Code/Conditions/Additional/conditions"
#P"kernel/contrib/sicl/Code/Conditions/Additional/condition-reporters-en"
#P"kernel/cleavir/packages" #P"kernel/cleavir/system"
#P"kernel/cleavir/ast" #P"kernel/cleavir/convert-form"
#P"kernel/cleavir/convert-special" #P"kernel/cleavir/hir"
#P"kernel/cleavir/introduce-invoke" #P"kernel/cleavir/setup"
#P"kernel/cleavir/ast-to-hir" #P"kernel/cleavir/mir"
#P"kernel/cleavir/hir-to-mir" #P"kernel/cleavir/ir"
#P"kernel/cleavir/gml-drawing" #P"kernel/cleavir/landing-pad"
#P"kernel/cleavir/arguments" #P"kernel/cleavir/translate" :CLEAVIR-CLASP
#P"/kernel/cleavir/inline" #P"/kernel/cleavir/auto-compile" :AUTO-COMPILE
:CCLASP))
2 changes: 1 addition & 1 deletion src/lisp/kernel/cleavir/asdf-system-groveler.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
(no-type
(make-pathname :directory (pathname-directory part-name)
:name (pathname-name part-name))))
(intern (namestring no-type) "CLASP-CLEAVIR")))
(pathname (namestring no-type))))
*all-source-files*)))
(nreverse source))))

Expand Down
7 changes: 5 additions & 2 deletions src/lisp/kernel/cleavir/cmpclasp.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
(asdf-system-groveler:determine-complete-set-of-asdf-source-files
(list :clasp-cleavir)))

(defun probe-all-files-in-system (system)
(error "Do something"))

;;;
;;; Create a list of source files for clasp+cleavir
;;; - Inject the kernel/cleavir/inlining.lisp file at :inlining
Expand All @@ -30,8 +33,8 @@
(list :bclasp)
*cleavir-clasp-only*
(list :cleavir-clasp)
(list #P"/kernel/cleavir/inline")
(list #P"/kernel/cleavir/auto-compile")
(list #P"kernel/cleavir/inline")
(list #P"kernel/cleavir/auto-compile")
(list :auto-compile :cclasp)))

;;; Setup the files to build for cclasp
Expand Down
15 changes: 15 additions & 0 deletions src/lisp/kernel/cleavir/workbench.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,21 @@
(load "sys:kernel;cleavir;cmpclasp.lisp")
(print (core:getpid)))

(defun get-pathname-with-type (module &optional (type "lsp"))
(etypecase module
(pathname
(merge-pathnames module
(make-pathname
:type type
:defaults (translate-logical-pathname
(make-pathname :host "sys")))))
(symbol
(merge-pathnames (pathname (string module))
(make-pathname :host "sys" :directory '(:absolute) :type type)))))

(get-pathname-with-type #P"kernel/contrib/sicl/Code/Cleavir/Generate-AST/ast-from-file" "lisp")


(in-package :clasp-cleavir)

(apropos "set-associated-funcs")
Expand Down

0 comments on commit d38da88

Please sign in to comment.