mirror of
https://github.com/drasko/codezero.git
synced 2026-07-12 02:14:12 +02:00
Added generation of ksyms.S to loader SConscript as a call to generate_break_virtual
File creation and cleanup works correctly. modified: loader/SConscript modified: scripts/loader/generate_break_virtual.py
This commit is contained in:
@@ -9,7 +9,25 @@ from os.path import join
|
|||||||
|
|
||||||
Import('env')
|
Import('env')
|
||||||
|
|
||||||
|
|
||||||
|
PROJRELROOT = '../../'
|
||||||
|
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(sys.modules['__main__'].__file__), PROJRELROOT)))
|
||||||
|
|
||||||
|
from config import projpaths
|
||||||
|
from scripts.loader.generate_break_virtual import *
|
||||||
|
|
||||||
|
#loader_ksyms = generate_ksym_to_loader(join(PROJROOT, 'loader/ksyms.S'), \
|
||||||
|
# join(BUILDDIR, 'kernel.elf'))
|
||||||
|
|
||||||
|
#loader_ksyms = Command([]'ksyms.S', 'kernel.elf', ksym_to_loader)
|
||||||
|
|
||||||
|
def ksym_to_loader(target, source, env):
|
||||||
|
generate_ksym_to_loader(target[0].path, source[0].path)
|
||||||
|
|
||||||
|
loader_ksyms = Command(join(PROJROOT, 'loader/ksyms.S'), join(BUILDDIR, 'kernel.elf'), ksym_to_loader)
|
||||||
|
|
||||||
src = Glob('*.[cS]')
|
src = Glob('*.[cS]')
|
||||||
objs = env.Object(src)
|
objs = env.Object(src)
|
||||||
|
|
||||||
|
Depends(src, loader_ksyms)
|
||||||
Return('objs')
|
Return('objs')
|
||||||
|
|||||||
@@ -10,8 +10,7 @@ from os.path import join
|
|||||||
|
|
||||||
PROJRELROOT = '../../'
|
PROJRELROOT = '../../'
|
||||||
|
|
||||||
SCRIPTROOT = os.path.abspath(os.path.dirname("."))
|
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), PROJRELROOT)))
|
||||||
sys.path.append(os.path.abspath(PROJRELROOT))
|
|
||||||
|
|
||||||
from config.projpaths import *
|
from config.projpaths import *
|
||||||
from config.configuration import *
|
from config.configuration import *
|
||||||
@@ -44,6 +43,9 @@ assembler_symbol_definition = \
|
|||||||
'''
|
'''
|
||||||
|
|
||||||
def generate_ksym_to_loader(target_path, source_path):
|
def generate_ksym_to_loader(target_path, source_path):
|
||||||
|
print "Source: ", source_path
|
||||||
|
print "Target: ", target_path
|
||||||
|
|
||||||
symbols = ['break_virtual']
|
symbols = ['break_virtual']
|
||||||
with open(target_path, 'w') as asm_file:
|
with open(target_path, 'w') as asm_file:
|
||||||
asm_file.write(ksym_header % (target_path, source_path, sys.argv[0]))
|
asm_file.write(ksym_header % (target_path, source_path, sys.argv[0]))
|
||||||
|
|||||||
Reference in New Issue
Block a user