fix constant propagation through the layers

so they can end up in the binary
This commit is contained in:
Torsten Ruger
2018-07-03 10:12:22 +03:00
parent 63dfee0978
commit bb1d1495db
5 changed files with 29 additions and 9 deletions

View File

@ -6,6 +6,11 @@ module Mom
@method_compilers = Risc::Builtin.boot_functions + compilers
end
# collects constants from all compilers into one array
def constants
@method_compilers.inject([]){|sum ,comp| sum + comp.constants }
end
# Translate code to whatever cpu is specified.
# Currently only :arm and :interpret
#
@ -15,7 +20,7 @@ module Mom
platform_sym = platform_sym.to_s.capitalize
platform = Risc::Platform.for(platform_sym)
assemblers = translate_methods( platform.translator )
Risc::Linker.new(platform , assemblers)
Risc::Linker.new(platform , assemblers , constants)
end
# go through all methods and translate them to cpu, given the translator
@ -35,7 +40,7 @@ module Mom
cpu_instructions << cpu if cpu
nekst = nekst.next
end
Risc::Assembler.new(compiler.method , cpu_instructions , compiler.constants)
Risc::Assembler.new(compiler.method , cpu_instructions )
end
end

View File

@ -1,10 +1,10 @@
module Risc
class Assembler
attr_reader :method , :instructions , :constants
def initialize( method , instructions, constants)
attr_reader :method , :instructions
def initialize( method , instructions)
@method = method
@instructions = instructions
@constants = constants
total = instructions.total_byte_length / 4 + 1
method.binary.extend_to( total )
end

View File

@ -13,7 +13,7 @@ module Risc
include Util::Logging
log_level :info
def initialize(platform , assemblers)
def initialize(platform , assemblers , constants)
if(platform.is_a?(Symbol))
platform = platform.to_s.capitalize
platform = Risc::Platform.for(platform)
@ -21,7 +21,7 @@ module Risc
raise "Platform must be platform, not #{platform.class}" unless platform.is_a?(Platform)
@platform = platform
@assemblers = assemblers
@constants = []
@constants = constants
@cpu_init = cpu_init_init
end