motiejus/zig
1
Fork 0
Code Releases Activity

sema: Place functions on AVR in flash addrspace

Browse Source 
- Use .flash as the default address space for functions on AVR
- Return .flash as the address space for function pointers on AVR
  without explicit address space
This commit is contained in:
Eckhart Köppen
2023-03-01 16:49:12 +02:00
committed by Veikka Tuominen
parent fdee558e45
commit 6be5946ed8
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Sema.zig
View File

@@ -17328,11 +17328,11 @@ fn zirPtrType(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air
break :blk abi_align;
} else 0;
const address_space = if (inst_data.flags.has_addrspace) blk: {
const address_space: std.builtin.AddressSpace = if (inst_data.flags.has_addrspace) blk: {
const ref = @intToEnum(Zir.Inst.Ref, sema.code.extra[extra_i]);
extra_i += 1;
break :blk try sema.analyzeAddressSpace(block, addrspace_src, ref, .pointer);
} else .generic;
} else if (elem_ty.zigTypeTag() == .Fn and target.cpu.arch == .avr) .flash else .generic;
const bit_offset = if (inst_data.flags.has_bit_range) blk: {
const ref = @intToEnum(Zir.Inst.Ref, sema.code.extra[extra_i]);

5
src/target.zig
View File

@@ -644,8 +644,9 @@ pub fn defaultAddressSpace(
function,
},
) AddressSpace {
_ = target;
_ = context;
// The default address space for functions on AVR is .flash to produce
// correct fixups into progmem.
if (context == .function and target.cpu.arch == .avr) return .flash;
return .generic;
}