mirror of
https://github.com/Ed94/pikuma_ps1.git
synced 2026-08-11 18:18:15 +00:00
Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7daeec0ee3 | ||
|
|
3f3b691ac0 | ||
|
|
a2d79d65eb | ||
|
|
bebcc6a585 | ||
|
|
ece21ed368 | ||
|
|
144c605ad8 | ||
|
|
4afd1af0fd | ||
|
|
004a7eff19 |
@@ -75,6 +75,26 @@
|
|||||||
* ----------------------------------------------------------------------------*/
|
* ----------------------------------------------------------------------------*/
|
||||||
#define atom_reg /* atom_reg: opt the preceding enum entry into the DWARF registry */
|
#define atom_reg /* atom_reg: opt the preceding enum entry into the DWARF registry */
|
||||||
|
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
// atom_auto_reg(atom, sym) — per-atom auto-allocated GPR binding.
|
||||||
|
// enum {
|
||||||
|
// atom_auto_reg(cube_g4_face, R_Fwdx), // expands to: R_Fwdx = R_Fwdx_Code /* atom_auto_reg: cube_g4_face */,
|
||||||
|
// atom_auto_reg(cube_g4_face, R_Eye_z) atom_type(S4), // atom_type chains after
|
||||||
|
// };
|
||||||
|
// (The macro IS the entire enum entry — no separate LHS=RHS. The `atom` scope is
|
||||||
|
// preserved in a trailing C-comment on the RHS so the Lua scanner can recover
|
||||||
|
// it after preprocessing strips the macro form. R_<Sym>_Code is resolved from gen/auto_reg.h which the .c file #include's before the enum declaration.)
|
||||||
|
#define atom_auto_reg(atom, sym) sym = sym ## _Code /* atom_auto_reg: atom */
|
||||||
|
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
// phase_auto_reg(phase, sym) — per-phase auto-allocated GPR binding.
|
||||||
|
// enum {
|
||||||
|
// phase_auto_reg(cube_g4, R_Temp0), // expands to: R_Temp0 = R_Temp0_Code /* phase_auto_reg: cube_g4 */,
|
||||||
|
// phase_auto_reg(cube_g4, R_Temp1),
|
||||||
|
// };
|
||||||
|
// (Same macro-as-enum-entry form as atom_auto_reg above; the `phase` scope is preserved in a trailing C-comment on the RHS for the Lua scanner to recover.)
|
||||||
|
#define phase_auto_reg(phase, sym) sym = sym ## _Code /* phase_auto_reg: phase */
|
||||||
|
|
||||||
/* ============================================================================
|
/* ============================================================================
|
||||||
* atom_info :
|
* atom_info :
|
||||||
* MipsAtom_(cube_tri) atom_info(
|
* MipsAtom_(cube_tri) atom_info(
|
||||||
|
|||||||
@@ -175,58 +175,6 @@ WORD_COUNT(mac_gte_sqr_v3, 8)
|
|||||||
, shift_aright_var(r_dz, r_dz, r_shift)
|
, shift_aright_var(r_dz, r_dz, r_shift)
|
||||||
WORD_COUNT(mac_gte_gpf_scale, 13)
|
WORD_COUNT(mac_gte_gpf_scale, 13)
|
||||||
|
|
||||||
/* atom_dbg_skip */
|
|
||||||
#define mac_normalize_v3s4(r_sx, r_sy, r_sz, r_sq_y, r_sq_z, r_recip_est, r_lzcr, r_shift, r_tmp) \
|
|
||||||
gte_mv_to_data_r(r_sx, C2_IR1) \
|
|
||||||
, gte_mv_to_data_r(r_sy, C2_IR2) \
|
|
||||||
, gte_mv_to_data_r(r_sz, C2_IR3) \
|
|
||||||
, nop \
|
|
||||||
, gte_cmdw_sqr /* ─── Stage 2: mfc2 MAC1/2/3, sum, mtc2 LZCS ─── // Note: r_recip_est first used as the sum accumulator (= |v|²), which is also what LZCS needs. */ \
|
|
||||||
, gte_mv_from_data_r(r_sq_y, C2_MAC1) /* r_sq_y = MAC1 = sx² */ \
|
|
||||||
, gte_mv_from_data_r(r_sq_z, C2_MAC2) /* r_sq_z = MAC2 = sy² */ \
|
|
||||||
, gte_mv_from_data_r(r_recip_est, C2_MAC3) /* r_recip_est = MAC3 = sz² */ \
|
|
||||||
, nop /* MFC2→GPR load delay (1 slot) */ \
|
|
||||||
, add_u(r_recip_est, r_recip_est, r_sq_z) /* r_recip_est += sy² */ \
|
|
||||||
, add_u(r_recip_est, r_recip_est, r_sq_y) /* r_recip_est += sx² (sum = |v|²) */ \
|
|
||||||
, gte_mv_to_data_r( r_recip_est, C2_LZCS) /* LZCS = |v|² */ \
|
|
||||||
, nop2 \
|
|
||||||
, gte_mv_from_data_r(r_lzcr, C2_LZCR) /* r_lzcr = LZCR (count of leading bits) */ \
|
|
||||||
, nop /* MFC2→GPR load delay (1 slot) */ /* ─── Stage 3: compute shift amount, align |v|² to bit 24, lookup 1/|v| ─── // Matches libgte `bltz +0x10 ; nop ; b +0x14 ; sllv t4,v0,t3` pattern: // - bltz TAKEN → nop (BD), jump to srav_path; sllv SKIPPED // - bltz !TAKEN → nop (BD), b +0x14 jumps to aligned_done; sllv (BD of b) executes */ \
|
|
||||||
, and_i( r_lzcr, r_lzcr, -2) /* r_lzcr &= ~1 (force even for halving) */ \
|
|
||||||
, li_s( r_shift, 31) /* r_shift = 31 */ \
|
|
||||||
, sub_s( r_shift, r_shift, r_lzcr) /* r_shift = 31 - LZCR */ \
|
|
||||||
, shift_aright( r_shift, r_shift, 1) /* r_shift = (31 - LZCR) / 2 */ \
|
|
||||||
, add_si( r_tmp, r_lzcr, -24) /* r_tmp = LZCR - 24 (signed, for branch) */ \
|
|
||||||
, branch_lt_zero(r_tmp, atom_offset(srav_path, aligned_done)) \
|
|
||||||
, nop \
|
|
||||||
, jump_rel( atom_offset(aligned_done, srav_path)) \
|
|
||||||
, shift_lleft_var(r_recip_est, r_recip_est, r_tmp) /* BD-slot of branch_equal: r_recip_est = |v|² << (LZCR - 24) */ \
|
|
||||||
, atom_label(srav_path) /* SRAV path: |v|² is small (top bit < bit 24) */ \
|
|
||||||
, li_s( r_tmp, 24) \
|
|
||||||
, sub_s( r_tmp, r_tmp, r_lzcr) /* r_tmp = 24 - LZCR */ \
|
|
||||||
, shift_aright_var(r_recip_est, r_recip_est, r_tmp) /* r_recip_est = |v|² >> (24 - LZCR) */ \
|
|
||||||
, atom_label(aligned_done) /* Both paths converge here with |v|² aligned to bit 24 */ /* r_recip_est now holds |v|² aligned to bit 24 — convert to byte offset, -64 to skip zero pad. */ \
|
|
||||||
, add_si( r_recip_est, r_recip_est, -64) \
|
|
||||||
, shift_lleft( r_recip_est, r_recip_est, 1) /* r_recip_est *= 2 (half-word index) */ /* Reference OUR local sqrtbl via &-address split. Compiler/linker resolves both halves. */ \
|
|
||||||
, load_upper_i( r_tmp, u4_hi(& gte_normalize_sqr_tbl)) /* lui */ \
|
|
||||||
, or_i_self( r_tmp, u4_lo(& gte_normalize_sqr_tbl)) /* ori */ \
|
|
||||||
, add_u( r_tmp, r_tmp, r_recip_est) /* r_tmp = sqrtbl base + byte offset (matches libgte 0x80016118: addu t5,t5,t4) */ \
|
|
||||||
, load_half( r_recip_est, r_tmp, 0) /* r_recip_est = sqrtbl[r_recip_est] = 1/|v| estimate */ \
|
|
||||||
, nop /* retire load_half before MTC2 (matches libgte 0x80016120: nop) */ /* ─── Stage 4: mtc2 IR0..3, GPF (MAC = IR0*IR), mfc2 MAC, srav finalize ─── // Componentized equivalent: mac_gte_gpf_scale. */ \
|
|
||||||
, gte_mv_to_data_r(r_recip_est, C2_IR0) /* IR0 = 1/|v| estimate */ \
|
|
||||||
, gte_mv_to_data_r(r_sx, C2_IR1) /* IR1 = src.x */ \
|
|
||||||
, gte_mv_to_data_r(r_sy, C2_IR2) /* IR2 = src.y */ \
|
|
||||||
, gte_mv_to_data_r(r_sz, C2_IR3) /* IR3 = src.z */ \
|
|
||||||
, nop2 /* COP2 transfer latency (2 slots) */ \
|
|
||||||
, gte_cmdw_gpf \
|
|
||||||
, gte_mv_from_data_r(r_sx, C2_MAC1) /* MAC1 → r_sx (overwrites src.x with raw reciprocal-scaled) */ \
|
|
||||||
, gte_mv_from_data_r(r_sy, C2_MAC2) \
|
|
||||||
, gte_mv_from_data_r(r_sz, C2_MAC3) \
|
|
||||||
, shift_aright_var(r_sx, r_sx, r_shift) \
|
|
||||||
, shift_aright_var(r_sy, r_sy, r_shift) \
|
|
||||||
, shift_aright_var(r_sz, r_sz, r_shift)
|
|
||||||
WORD_COUNT(mac_normalize_v3s4, 48)
|
|
||||||
|
|
||||||
#define mac_gcmd_push(cmd, reg_transfer, reg_base, port) \
|
#define mac_gcmd_push(cmd, reg_transfer, reg_base, port) \
|
||||||
load_upper_i(reg_transfer, cmd >> 16) \
|
load_upper_i(reg_transfer, cmd >> 16) \
|
||||||
, or_i_self( reg_transfer, cmd & 0xFFFF) \
|
, or_i_self( reg_transfer, cmd & 0xFFFF) \
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
#pragma region duffle
|
#pragma region duffle
|
||||||
|
|
||||||
|
|
||||||
// --- atom: ac_normalize_v3s4 (48 words) ---
|
// --- atom: normalize_v3s4 (63 words) ---
|
||||||
|
|
||||||
#define _atom_offset_srav_path_aligned_done 6
|
#define _atom_offset_srav_path_aligned_done 6
|
||||||
#define _atom_offset_aligned_done_srav_path 1
|
#define _atom_offset_aligned_done_srav_path 1
|
||||||
|
|||||||
+10
-10
@@ -8,35 +8,35 @@ ATOM_FILE_DEBUGGER_LINE_MARKER(gp_atom_c);
|
|||||||
|
|
||||||
#pragma region MACs (Mips Atom Components)
|
#pragma region MACs (Mips Atom Components)
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_gcmd_push(U4 cmd, U4 reg_transfer, U4 reg_base, U2 port)
|
FI_ Slice_MipsCode ac_gcmd_push(AtomBuilder_R ab, U4 cmd, U4 reg_transfer, U4 reg_base, U2 port)
|
||||||
MipsAtomComp_Proc_(ac_gcmd_push, {
|
MipsAtomComp_Proc_(ac_gcmd_push, ab, {
|
||||||
load_upper_i(reg_transfer, cmd >> 16),
|
load_upper_i(reg_transfer, cmd >> 16),
|
||||||
or_i_self( reg_transfer, cmd & 0xFFFF),
|
or_i_self( reg_transfer, cmd & 0xFFFF),
|
||||||
store_word( reg_transfer, reg_base, port),
|
store_word( reg_transfer, reg_base, port),
|
||||||
})
|
})
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_store_rgb8(U1 rr, U1 rg, U1 rb, U4 base, U4 offset) atom_dbg_skip MipsAtomComp_Proc_(ac_store_rgb8, {
|
FI_ Slice_MipsCode ac_store_rgb8(AtomBuilder_R ab, U1 rr, U1 rg, U1 rb, U4 base, U4 offset) atom_dbg_skip MipsAtomComp_Proc_(ac_store_rgb8, ab, {
|
||||||
store_byte(rr, base, offset + O_(RGB8,r)),
|
store_byte(rr, base, offset + O_(RGB8,r)),
|
||||||
store_byte(rg, base, offset + O_(RGB8,g)),
|
store_byte(rg, base, offset + O_(RGB8,g)),
|
||||||
store_byte(rb, base, offset + O_(RGB8,b)),
|
store_byte(rb, base, offset + O_(RGB8,b)),
|
||||||
})
|
})
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_pack_color_word(U4 r_base, U4 off, U4 cmd, U1 r, U1 g, U1 b)
|
FI_ Slice_MipsCode ac_pack_color_word(AtomBuilder_R ab, U4 r_base, U4 off, U4 cmd, U1 r, U1 g, U1 b)
|
||||||
atom_dbg_skip MipsAtomComp_Proc_(ac_pack_color_word, {
|
atom_dbg_skip MipsAtomComp_Proc_(ac_pack_color_word, ab, {
|
||||||
load_upper_i(R_AT, (cmd) << 8 | (b)),
|
load_upper_i(R_AT, (cmd) << 8 | (b)),
|
||||||
or_i_self( R_AT, ((g) << 8) | (r)),
|
or_i_self( R_AT, ((g) << 8) | (r)),
|
||||||
store_word( R_AT, r_base, (off)),
|
store_word( R_AT, r_base, (off)),
|
||||||
})
|
})
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_format_f3_color(U4 r_base, U1 r, U1 g, U1 b)
|
FI_ Slice_MipsCode ac_format_f3_color(AtomBuilder_R ab, U4 r_base, U1 r, U1 g, U1 b)
|
||||||
atom_dbg_skip MipsAtomComp_Proc_(ac_format_f3_color, { mac_pack_color_word(r_base, O_(Poly_F3,color), gp0_cmd_poly_f3, r, g, b) })
|
atom_dbg_skip MipsAtomComp_Proc_(ac_format_f3_color, ab, { mac_pack_color_word(r_base, O_(Poly_F3,color), gp0_cmd_poly_f3, r, g, b) })
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_format_g4_color(U4 r_prim_cursor,
|
FI_ Slice_MipsCode ac_format_g4_color(AtomBuilder_R ab, U4 r_prim_cursor,
|
||||||
U1 r0, U1 g0, U1 b0,
|
U1 r0, U1 g0, U1 b0,
|
||||||
U1 r1, U1 g1, U1 b1,
|
U1 r1, U1 g1, U1 b1,
|
||||||
U1 r2, U1 g2, U1 b2,
|
U1 r2, U1 g2, U1 b2,
|
||||||
U1 r3, U1 g3, U1 b3)
|
U1 r3, U1 g3, U1 b3)
|
||||||
MipsAtomComp_Proc_(ac_format_g4_color, {
|
MipsAtomComp_Proc_(ac_format_g4_color, ab, {
|
||||||
mac_pack_color_word(r_prim_cursor, O_(Poly_G4,c0), gp0_cmd_poly_g4, r0,g0,b0),
|
mac_pack_color_word(r_prim_cursor, O_(Poly_G4,c0), gp0_cmd_poly_g4, r0,g0,b0),
|
||||||
mac_pack_color_word(r_prim_cursor, O_(Poly_G4,c1), 0, r1,g1,b1),
|
mac_pack_color_word(r_prim_cursor, O_(Poly_G4,c1), 0, r1,g1,b1),
|
||||||
mac_pack_color_word(r_prim_cursor, O_(Poly_G4,c2), 0, r2,g2,b2),
|
mac_pack_color_word(r_prim_cursor, O_(Poly_G4,c2), 0, r2,g2,b2),
|
||||||
@@ -44,7 +44,7 @@ MipsAtomComp_Proc_(ac_format_g4_color, {
|
|||||||
})
|
})
|
||||||
|
|
||||||
/* Words: 11; Correctly inserts a primitive into the Ordering Table linked list. */
|
/* Words: 11; Correctly inserts a primitive into the Ordering Table linked list. */
|
||||||
I_ Slice_MipsCode ac_insert_ot_tag(U4 r_ot_base, U4 r_prim_cursor, U4 poly_size) MipsAtomComp_Proc_(ac_insert_ot_tag, {
|
I_ Slice_MipsCode ac_insert_ot_tag(AtomBuilder_R ab, U4 r_ot_base, U4 r_prim_cursor, U4 poly_size) MipsAtomComp_Proc_(ac_insert_ot_tag, ab, {
|
||||||
shift_lleft( R_T1, R_T1, S_(U4)/2), // T1 = otz * S_(U4) (otz arg is implicit R_T1)
|
shift_lleft( R_T1, R_T1, S_(U4)/2), // T1 = otz * S_(U4) (otz arg is implicit R_T1)
|
||||||
add_u_self( R_T1, r_ot_base), // T1 = & OrderingTable[OTZ]
|
add_u_self( R_T1, r_ot_base), // T1 = & OrderingTable[OTZ]
|
||||||
load_word( R_AT, R_T1, O_(PolyTag,code)), // AT = old_ot_head
|
load_word( R_AT, R_T1, O_(PolyTag,code)), // AT = old_ot_head
|
||||||
|
|||||||
+128
-108
@@ -11,7 +11,7 @@ ATOM_FILE_DEBUGGER_LINE_MARKER(gte_atom_c);
|
|||||||
#pragma region MACs (Mips Atom Components)
|
#pragma region MACs (Mips Atom Components)
|
||||||
|
|
||||||
/* Words: 3; Loads 3 S2 indices from the face array */
|
/* Words: 3; Loads 3 S2 indices from the face array */
|
||||||
FI_ Slice_MipsCode ac_load_tri_indices(U4 r_face_cusor, U4 r_i0, U4 r_i1, U4 r_i2) atom_dbg_skip MipsAtomComp_Proc_(ac_load_tri_indices, {
|
FI_ Slice_MipsCode ac_load_tri_indices(AtomBuilder_R ab, U4 r_face_cusor, U4 r_i0, U4 r_i1, U4 r_i2) atom_dbg_skip MipsAtomComp_Proc_(ac_load_tri_indices, ab, {
|
||||||
load_half_u(r_i0, r_face_cusor, 0 * S_(S2)),
|
load_half_u(r_i0, r_face_cusor, 0 * S_(S2)),
|
||||||
load_half_u(r_i1, r_face_cusor, 1 * S_(S2)),
|
load_half_u(r_i1, r_face_cusor, 1 * S_(S2)),
|
||||||
load_half_u(r_i2, r_face_cusor, 2 * S_(S2)),
|
load_half_u(r_i2, r_face_cusor, 2 * S_(S2)),
|
||||||
@@ -19,14 +19,14 @@ FI_ Slice_MipsCode ac_load_tri_indices(U4 r_face_cusor, U4 r_i0, U4 r_i1, U4 r_i
|
|||||||
|
|
||||||
/* Words: 3; Stores the 3 transformed (V2_S2 screen) vertices to the F3.
|
/* Words: 3; Stores the 3 transformed (V2_S2 screen) vertices to the F3.
|
||||||
* PIPELINE: post-RTPT (SXY0=v0.screen, SXY1=v1.screen, SXY2=v2.screen). */
|
* PIPELINE: post-RTPT (SXY0=v0.screen, SXY1=v1.screen, SXY2=v2.screen). */
|
||||||
FI_ Slice_MipsCode ac_gte_store_f3(U4 r_primitive_cursor) atom_dbg_skip MipsAtomComp_Proc_(ac_gte_store_f3, {
|
FI_ Slice_MipsCode ac_gte_store_f3(AtomBuilder_R ab, U4 r_primitive_cursor) atom_dbg_skip MipsAtomComp_Proc_(ac_gte_store_f3, ab, {
|
||||||
gte_sw(C2_SXY0, r_primitive_cursor, O_(Poly_F3,p0)),
|
gte_sw(C2_SXY0, r_primitive_cursor, O_(Poly_F3,p0)),
|
||||||
gte_sw(C2_SXY1, r_primitive_cursor, O_(Poly_F3,p1)),
|
gte_sw(C2_SXY1, r_primitive_cursor, O_(Poly_F3,p1)),
|
||||||
gte_sw(C2_SXY2, r_primitive_cursor, O_(Poly_F3,p2)),
|
gte_sw(C2_SXY2, r_primitive_cursor, O_(Poly_F3,p2)),
|
||||||
})
|
})
|
||||||
|
|
||||||
/* Words: 18; Translates indices to vertex addresses and pushes them to GTE */
|
/* Words: 18; Translates indices to vertex addresses and pushes them to GTE */
|
||||||
I_ Slice_MipsCode ac_gte_load_tri_verts(U4 r_vert_base, U4 r_v0, U4 r_v1, U4 r_v2) atom_dbg_skip MipsAtomComp_Proc_(ac_gte_load_tri_verts, {
|
I_ Slice_MipsCode ac_gte_load_tri_verts(AtomBuilder_R ab, U4 r_vert_base, U4 r_v0, U4 r_v1, U4 r_v2) atom_dbg_skip MipsAtomComp_Proc_(ac_gte_load_tri_verts, ab, {
|
||||||
shift_lleft(R_AT, r_v0, v3s2_byteoff), add_u_self(R_AT, r_vert_base), load_word(R_V0, R_AT, O_(V3_S2,x)), load_word(R_V1, R_AT, O_(V3_S2,z)), gte_mv_to_data_r(R_V0, C2_VXY0), gte_mv_to_data_r(R_V1, C2_VZ0),
|
shift_lleft(R_AT, r_v0, v3s2_byteoff), add_u_self(R_AT, r_vert_base), load_word(R_V0, R_AT, O_(V3_S2,x)), load_word(R_V1, R_AT, O_(V3_S2,z)), gte_mv_to_data_r(R_V0, C2_VXY0), gte_mv_to_data_r(R_V1, C2_VZ0),
|
||||||
shift_lleft(R_AT, r_v1, v3s2_byteoff), add_u_self(R_AT, r_vert_base), load_word(R_V0, R_AT, O_(V3_S2,x)), load_word(R_V1, R_AT, O_(V3_S2,z)), gte_mv_to_data_r(R_V0, C2_VXY1), gte_mv_to_data_r(R_V1, C2_VZ1),
|
shift_lleft(R_AT, r_v1, v3s2_byteoff), add_u_self(R_AT, r_vert_base), load_word(R_V0, R_AT, O_(V3_S2,x)), load_word(R_V1, R_AT, O_(V3_S2,z)), gte_mv_to_data_r(R_V0, C2_VXY1), gte_mv_to_data_r(R_V1, C2_VZ1),
|
||||||
shift_lleft(R_AT, r_v2, v3s2_byteoff), add_u_self(R_AT, r_vert_base), load_word(R_V0, R_AT, O_(V3_S2,x)), load_word(R_V1, R_AT, O_(V3_S2,z)), gte_mv_to_data_r(R_V0, C2_VXY2), gte_mv_to_data_r(R_V1, C2_VZ2),
|
shift_lleft(R_AT, r_v2, v3s2_byteoff), add_u_self(R_AT, r_vert_base), load_word(R_V0, R_AT, O_(V3_S2,x)), load_word(R_V1, R_AT, O_(V3_S2,z)), gte_mv_to_data_r(R_V0, C2_VXY2), gte_mv_to_data_r(R_V1, C2_VZ2),
|
||||||
@@ -37,7 +37,7 @@ I_ Slice_MipsCode ac_gte_load_tri_verts(U4 r_vert_base, U4 r_v0, U4 r_v1, U4 r_v
|
|||||||
* PIPELINE: post-RTPT, pre-RTPS (SXY0=v0.screen, SXY1=v1.screen, SXY2=v2.screen).
|
* PIPELINE: post-RTPT, pre-RTPS (SXY0=v0.screen, SXY1=v1.screen, SXY2=v2.screen).
|
||||||
* MUST be called BEFORE V3-RTPS, otherwise SXY0/1/2 get overwritten with v3
|
* MUST be called BEFORE V3-RTPS, otherwise SXY0/1/2 get overwritten with v3
|
||||||
* (RTPS writes only to SXY2, but to keep the three registers aligned with v0/v1/v2 you must store before RTPS). */
|
* (RTPS writes only to SXY2, but to keep the three registers aligned with v0/v1/v2 you must store before RTPS). */
|
||||||
FI_ Slice_MipsCode ac_gte_store_g4_p012(U4 r_primitive_cursor) atom_dbg_skip MipsAtomComp_Proc_(ac_gte_store_g4_p012, {
|
FI_ Slice_MipsCode ac_gte_store_g4_p012(AtomBuilder_R ab, U4 r_primitive_cursor) atom_dbg_skip MipsAtomComp_Proc_(ac_gte_store_g4_p012, ab, {
|
||||||
gte_sw(C2_SXY0, r_primitive_cursor, O_(Poly_G4,p0)),
|
gte_sw(C2_SXY0, r_primitive_cursor, O_(Poly_G4,p0)),
|
||||||
gte_sw(C2_SXY1, r_primitive_cursor, O_(Poly_G4,p1)),
|
gte_sw(C2_SXY1, r_primitive_cursor, O_(Poly_G4,p1)),
|
||||||
gte_sw(C2_SXY2, r_primitive_cursor, O_(Poly_G4,p2)),
|
gte_sw(C2_SXY2, r_primitive_cursor, O_(Poly_G4,p2)),
|
||||||
@@ -47,13 +47,13 @@ FI_ Slice_MipsCode ac_gte_store_g4_p012(U4 r_primitive_cursor) atom_dbg_skip Mip
|
|||||||
* PIPELINE: post-RTPS (SXY2 holds v3.screen because RTPS writes its single-vertex result to SXY2;
|
* PIPELINE: post-RTPS (SXY2 holds v3.screen because RTPS writes its single-vertex result to SXY2;
|
||||||
* SXY0 still holds v0.screen from the earlier RTPT.
|
* SXY0 still holds v0.screen from the earlier RTPT.
|
||||||
*/
|
*/
|
||||||
FI_ Slice_MipsCode ac_gte_store_g4_p3(U4 r_primitive_cursor) atom_dbg_skip MipsAtomComp_Proc_(ac_gte_store_g4_p3, { gte_sw(C2_SXY2, r_primitive_cursor, O_(Poly_G4,p3)) })
|
FI_ Slice_MipsCode ac_gte_store_g4_p3(AtomBuilder_R ab, U4 r_primitive_cursor) atom_dbg_skip MipsAtomComp_Proc_(ac_gte_store_g4_p3, ab, { gte_sw(C2_SXY2, r_primitive_cursor, O_(Poly_G4,p3)) })
|
||||||
|
|
||||||
/* ─── STAGE 1 of normalize: SQR + mfc2 MAC1/2/3 ───
|
/* ─── STAGE 1 of normalize: SQR + mfc2 MAC1/2/3 ───
|
||||||
* Emits squared magnitude per component (in MAC1/2/3) into caller-provided scratch regs.
|
* Emits squared magnitude per component (in MAC1/2/3) into caller-provided scratch regs.
|
||||||
* Stage 2 of normalize consumes these directly.
|
* Stage 2 of normalize consumes these directly.
|
||||||
* Words: 8. Clobbers: IR1/2/3, MAC1/2/3. Uses gte_cmdw_sqr (sf=0, lm=1). */
|
* Words: 8. Clobbers: IR1/2/3, MAC1/2/3. Uses gte_cmdw_sqr (sf=0, lm=1). */
|
||||||
FI_ Slice_MipsCode ac_gte_sqr_v3(U4 r_sx, U4 r_sy, U4 r_sz, U4 r_sq_x, U4 r_sq_y, U4 r_sq_z) atom_dbg_skip MipsAtomComp_Proc_(ac_gte_sqr_v3, {
|
FI_ Slice_MipsCode ac_gte_sqr_v3(AtomBuilder_R ab, U4 r_sx, U4 r_sy, U4 r_sz, U4 r_sq_x, U4 r_sq_y, U4 r_sq_z) atom_dbg_skip MipsAtomComp_Proc_(ac_gte_sqr_v3, ab, {
|
||||||
gte_mv_to_data_r(r_sx, C2_IR1),
|
gte_mv_to_data_r(r_sx, C2_IR1),
|
||||||
gte_mv_to_data_r(r_sy, C2_IR2),
|
gte_mv_to_data_r(r_sy, C2_IR2),
|
||||||
gte_mv_to_data_r(r_sz, C2_IR3),
|
gte_mv_to_data_r(r_sz, C2_IR3),
|
||||||
@@ -68,7 +68,7 @@ FI_ Slice_MipsCode ac_gte_sqr_v3(U4 r_sx, U4 r_sy, U4 r_sz, U4 r_sq_x, U4 r_sq_y
|
|||||||
* (typically (31 - LZCR)/2), multiplies IR0*IR[i] via GPF and shifts right to produce the normalized output.
|
* (typically (31 - LZCR)/2), multiplies IR0*IR[i] via GPF and shifts right to produce the normalized output.
|
||||||
* Used standalone for "scale vector by scalar".
|
* Used standalone for "scale vector by scalar".
|
||||||
* Words: 11. Clobbers: IR0..3, MAC1..3. Uses gte_cmdw_gpf (sf=0, lm=0). */
|
* Words: 11. Clobbers: IR0..3, MAC1..3. Uses gte_cmdw_gpf (sf=0, lm=0). */
|
||||||
FI_ Slice_MipsCode ac_gte_gpf_scale(U4 r_sx, U4 r_sy, U4 r_sz, U4 r_recip_est, U4 r_shift, U4 r_dx, U4 r_dy, U4 r_dz) atom_dbg_skip MipsAtomComp_Proc_(ac_gte_gpf_scale, {
|
FI_ Slice_MipsCode ac_gte_gpf_scale(AtomBuilder_R ab, U4 r_sx, U4 r_sy, U4 r_sz, U4 r_recip_est, U4 r_shift, U4 r_dx, U4 r_dy, U4 r_dz) atom_dbg_skip MipsAtomComp_Proc_(ac_gte_gpf_scale, ab, {
|
||||||
gte_mv_to_data_r(r_recip_est, C2_IR0),
|
gte_mv_to_data_r(r_recip_est, C2_IR0),
|
||||||
gte_mv_to_data_r(r_sx, C2_IR1),
|
gte_mv_to_data_r(r_sx, C2_IR1),
|
||||||
gte_mv_to_data_r(r_sy, C2_IR2),
|
gte_mv_to_data_r(r_sy, C2_IR2),
|
||||||
@@ -83,6 +83,10 @@ FI_ Slice_MipsCode ac_gte_gpf_scale(U4 r_sx, U4 r_sy, U4 r_sz, U4 r_recip_est, U
|
|||||||
shift_aright_var(r_dz, r_dz, r_shift),
|
shift_aright_var(r_dz, r_dz, r_shift),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
#pragma endregion MACs (Mips Atom Components)
|
||||||
|
|
||||||
|
#pragma region Atom Procs
|
||||||
|
|
||||||
/* ─── Local copy of PSYQ's sqrtbl (1/sqrt lookup table for VectorNormal). ───
|
/* ─── Local copy of PSYQ's sqrtbl (1/sqrt lookup table for VectorNormal). ───
|
||||||
* Source: PSYQ 4.7 libgte sqrtbl at 0x800185B4 in hello_camera.elf.
|
* Source: PSYQ 4.7 libgte sqrtbl at 0x800185B4 in hello_camera.elf.
|
||||||
* objdump -s --start-address=0x800185B4 --stop-address=0x800185F4 hello_camera.elf
|
* objdump -s --start-address=0x800185B4 --stop-address=0x800185F4 hello_camera.elf
|
||||||
@@ -97,8 +101,8 @@ FI_ Slice_MipsCode ac_gte_gpf_scale(U4 r_sx, U4 r_sy, U4 r_sz, U4 r_recip_est, U
|
|||||||
* Octave 1 (entries 48- 95): mantissa in [0x10000, 0x20000) output ~[0.707, 0.500]
|
* Octave 1 (entries 48- 95): mantissa in [0x10000, 0x20000) output ~[0.707, 0.500]
|
||||||
* Octave 2 (entries 96-143): mantissa in [0x20000, 0x40000) output ~[0.500, 0.354]
|
* Octave 2 (entries 96-143): mantissa in [0x20000, 0x40000) output ~[0.500, 0.354]
|
||||||
* Octave 3 (entries144-191): mantissa in [0x40000, 0x80000) output ~[0.354, 0.251]
|
* Octave 3 (entries144-191): mantissa in [0x40000, 0x80000) output ~[0.354, 0.251]
|
||||||
* Within each octave, 8 sub-entries interpolate over the 8 fractional bits of the
|
* Within each octave, 8 sub-entries interpolate over the 8 fractional bits of the mantissa
|
||||||
* mantissa (the byte `(0x80 | (i mod 8))` for the lower-byte of the aligned value).
|
* (the byte `(0x80 | (i mod 8))` for the lower-byte of the aligned value).
|
||||||
* Sampling the first value of each octave:
|
* Sampling the first value of each octave:
|
||||||
* [0] 0x1000 = 1.0000 ; 1 / sqrt(1.0000)
|
* [0] 0x1000 = 1.0000 ; 1 / sqrt(1.0000)
|
||||||
* [48] 0x0e4f = 0.8940 ; 1 / sqrt(1.2500)
|
* [48] 0x0e4f = 0.8940 ; 1 / sqrt(1.2500)
|
||||||
@@ -150,116 +154,132 @@ internal S2 const gte_normalize_sqr_tbl[192] align_(2) = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/* ─── Full normalize (all 4 stages inline) ───
|
/* ─── Full normalize (all 4 stages inline) ───
|
||||||
|
* Generic 4-stage GTE normalize (SQR → sum+LZCR → align+sqrtbl → GPF+srav).
|
||||||
|
*
|
||||||
|
* Parameterized by caller-provided scratch base + src/dst offsets.
|
||||||
|
* The caller passes r_src_offset and r_dst_offset as compile-time constants
|
||||||
|
* (typically derived from O_ macros in the caller's struct schema, e.g., `O_(CallerBundleScratch, fwd)`).
|
||||||
|
*
|
||||||
|
* This design lets any caller (with a scratch base + struct schema) use `normalize_v3s4_proc`
|
||||||
|
* without putting magic offsets in the C-side bundle helper — the offsets come from O_ macros at the call site.
|
||||||
|
*
|
||||||
|
* Body uses 9 GPRs (r_src_ptr..r_branch_tmp):
|
||||||
|
* r_src_ptr, r_dst_ptr : src/dst pointers (computed from r_scratch + caller offsets)
|
||||||
|
* r_tmp : src.x PRESERVED across stages 1-2 (NOT clobbered by mfc2 MAC2) → fed to IR1 in stage 4
|
||||||
|
* r_mac1_scratch : MAC1 result scratch (also holds aligned |v|² in stage 3)
|
||||||
|
* r_mac2_scratch : MAC2 result scratch → result.x after stage 4 sra
|
||||||
|
* r_recip_est : src.y PRESERVED across stages 1-2 → fed to IR2 in stage 4 → result.y
|
||||||
|
* r_lzcr : |v|² sum (stage 2) → shift count (stage 3) → 1/|v| (stage 4 IR0)
|
||||||
|
* r_shift : shift count SAVED in stage 3 → consumed by stage 4 srav
|
||||||
|
* r_branch_tmp : src.z PRESERVED across stages 1-2 → fed to IR3 in stage 4 → result.z (also sqrtbl base addr)
|
||||||
|
*
|
||||||
|
* Atom_labels are srav_path / aligned_done
|
||||||
|
* (NOT namespaced — they're internal to this proc;
|
||||||
|
* the metaprogram's per-atom-name enum emission handles any collision across different atoms/files that share the same labels).
|
||||||
|
*
|
||||||
|
* Pool cost: 11 GPRs (well within the 9-10 caller-trash GPR budget when r_scratch is a wave-context carrier).
|
||||||
|
*
|
||||||
* Direct port of PSYQ libgte msc02.rel.text VectorNormal disassembly (0x800160a0..0x8001615c).
|
* Direct port of PSYQ libgte msc02.rel.text VectorNormal disassembly (0x800160a0..0x8001615c).
|
||||||
*
|
* Words: ~59 (matches libgte 0x800160a0..0x8001615c at +/- 0-2 words for BD-slot reshuffling).
|
||||||
* Component variants that could apply:
|
* Sqrtbl: hardcoded to 0x800185B4 (libgte msc02.rel.data). Note: swapped to local.
|
||||||
* - `ac_gte_sqr_v3` (line ~56) covers stage 1's `mtc2 IR1/2/3 + nop + gte_cmdw_sqr`.
|
|
||||||
* We do NOT call it because the inlined version of stage 1 is followed immediately by stage 2's `mfc2 MAC1/2/3` chain
|
|
||||||
* (the operands of `ac_gte_sqr_v3`'s r_sq_x/r_sq_y/r_sq_z would each require an explicit GPR to receive the MAC result,
|
|
||||||
* then a move to land in r_recip_est for the partial-sum chain).
|
|
||||||
* Inlining saves ~3 cycles of `or`-merge + register pressure
|
|
||||||
* (squared MAC3 lands DIRECTLY in r_recip_est which doubles as the partial-sum accumulator and the LZCS input — see r_recip_est row below).
|
|
||||||
* - `ac_gte_gpf_scale` (line ~71) covers stage 4's `mtc2 IR0..3 + nop2 + gte_cmdw_gpf + mfc2 MAC1/2/3 + sra`.
|
|
||||||
* We do NOT call it for the symmetric reason: the normalize in-place semantics overwrite the input regs (r_sx/r_sy/r_sz) with the normalized output,
|
|
||||||
* which `ac_gte_gpf_scale`'s r_dx/r_dy/r_dz output GPRs would not match.
|
|
||||||
* `gte_cmdw_sqr` and `gte_cmdw_gpf` primitive macros ARE used in the inlined body, so changes to those primitives
|
|
||||||
* (e.g., the libgte `fake_cmd` signature bits) propagate automatically. The components remain available for callers that want the explicit GPR-shape variants.
|
|
||||||
*
|
|
||||||
* Argument aliasing (9 unique physical regs needed, can drop to 8 with r_sq_y ≡ r_lzcr):
|
|
||||||
* r_sx, r_sy, r_sz : src components in regs (clobbered by mtc2 → IR1/2/3 in stage 1, then by mfc2 MAC1/2/3 in stage 4 — in-place semantics)
|
|
||||||
* r_sq_y, r_sq_z : MAC2, MAC3 → DIE after stage 2 accumulate (r_sq_y can alias r_lzcr after stage 2 to save one reg)
|
|
||||||
* r_recip_est : ≡ r_sqmag — multi-purpose (holds |v|² in stage 2, shift-input in stage 3, sqrtbl[index] in stage 4)
|
|
||||||
* r_lzcr : LZCR value, alive across stage 3 (srav path needs `24 - LZCR`)
|
|
||||||
* r_shift : (31 - LZCR & ~1) >> 1 — final srav amount (stages 3-4)
|
|
||||||
* r_tmp : scratch (shift count, branch target, lookup addr, table base)
|
|
||||||
*
|
|
||||||
* GPR ccount peak: 9.
|
|
||||||
* Pipeline: clobbers IR0..3, MAC1..3, LZCS, LZCR.
|
* Pipeline: clobbers IR0..3, MAC1..3, LZCS, LZCR.
|
||||||
* Words: ~35 (pending re-gen; matches libgte 0x800160a0..0x8001615c at +/- 0-2 words for BD-slot reshuffling).
|
*/
|
||||||
* Sqrtbl: hardcoded to 0x800185B4 (libgte msc02.rel.data). Note: swapped to local. */
|
/* MipsAtom_Proc_ wrapper: declares the static MipsCode[] body, then calls atombuilder_unroll(ab, ...) to copy the encoded instructions into the caller's MipsAtomBuilder arena. */
|
||||||
I_ Slice_MipsCode ac_normalize_v3s4(U4 r_sx, U4 r_sy, U4 r_sz, U4 r_sq_y, U4 r_sq_z, U4 r_recip_est, U4 r_lzcr, U4 r_shift, U4 r_tmp)
|
I_ MipsAtom* normalize_v3s4_proc(AtomArena_R aa, U4 r_scratch /* GPR code: scratch base carrier (e.g., R_T4 = R_ResolveScratch) */
|
||||||
atom_dbg_skip MipsAtomComp_Proc_(ac_normalize_v3s4, {
|
, U4 r_src_offset, U4 r_dst_offset /* GPR codes: PARAMETERIZED offsets (caller passes O_ macros) */
|
||||||
/* 9-arg signature — must be on one line so the metaprogram captures the full arg list.
|
, U4 r_src_ptr, U4 r_dst_ptr, U4 r_tmp /* GPR codes: 3 scratch regs (src/dst computed + tmp) */
|
||||||
* r_sx, r_sy, r_sz : in/out — src components, overwritten with normalized
|
, U4 r_mac1_scratch, U4 r_mac2_scratch /* GPR codes: 2 more: MAC1/MAC2 scratch */
|
||||||
* r_sq_y, r_sq_z : scratch — MAC2, MAC3 → die after stage 2 accumulate (r_sq_y may alias r_lzcr post-stage-2)
|
, U4 r_recip_est /* GPR code: |v|² sum + shift-input + sqrtbl[index] */
|
||||||
* r_recip_est : ≡ r_sqmag — multi-purpose (|v|² → shift-input → sqrtbl entry)
|
, U4 r_lzcr, U4 r_shift /* GPR codes: lzcr + final srav amount */
|
||||||
* r_lzcr : LZCR value (alive across stage 3 srav path)
|
, U4 r_branch_tmp /* GPR code: scratch (shift count, branch target, lookup addr) */
|
||||||
* r_shift : (31 - LZCR & ~1) / 2 — final srav amount (stages 3-4)
|
)
|
||||||
* r_tmp : scratch — shift count, branch target, lookup addr, table base
|
MipsAtom_Proc_(normalize_v3s4, aa, {
|
||||||
*
|
add_si(r_src_ptr, r_scratch, r_src_offset), /* r_src_ptr = &src */
|
||||||
* GPR ccount peak: 9.
|
add_si(r_dst_ptr, r_scratch, r_dst_offset), /* r_dst_ptr = &dst */
|
||||||
* Pipeline: clobbers IR0..3, MAC1..3, LZCS, LZCR.
|
nop,
|
||||||
* Words: ~35 (pending re-gen; matches libgte 0x800160a0..0x8001615c at +/- 0-2 words).
|
|
||||||
*
|
|
||||||
* Sqrtbl address: link-time constant `>e_normalize_sqrtbl`, split via >>16 and &0xFFFF. */
|
|
||||||
|
|
||||||
// ─── Stage 1: mtc2 src → IR1/2/3, SQR fires (MAC1/2/3 = IR², IR ← MAC saturated) ───
|
/* Load src.x/y/z from r_src_ptr (caller-determined address) into r_tmp/r_recip_est/r_branch_tmp.
|
||||||
// Componentized equivalent: mac_gte_sqr_v3(r_sx, r_sy, r_sz, r_sq_x, r_sq_y, r_sq_z).
|
* r_tmp holds src.x throughout stages 1-2 — r_mac2_scratch is clobbered to MAC2 in stage 1.5 (line below). */
|
||||||
// We inline for GPR-pressure reasons (see file-level comment).
|
load_word(r_tmp, r_src_ptr, O_(V3_S4,x)),
|
||||||
gte_mv_to_data_r(r_sx, C2_IR1),
|
load_word(r_recip_est, r_src_ptr, O_(V3_S4,y)),
|
||||||
gte_mv_to_data_r(r_sy, C2_IR2),
|
load_word(r_branch_tmp, r_src_ptr, O_(V3_S4,z)),
|
||||||
gte_mv_to_data_r(r_sz, C2_IR3),
|
nop, /* load-delay */
|
||||||
|
|
||||||
|
/* Stage 1: mtc2 src → IR1/2/3, SQR fires. */
|
||||||
|
gte_mv_to_data_r(r_tmp, C2_IR1),
|
||||||
|
gte_mv_to_data_r(r_recip_est, C2_IR2),
|
||||||
|
gte_mv_to_data_r(r_branch_tmp, C2_IR3),
|
||||||
nop, gte_cmdw_sqr,
|
nop, gte_cmdw_sqr,
|
||||||
|
|
||||||
// ─── Stage 2: mfc2 MAC1/2/3, sum, mtc2 LZCS ───
|
/* Stage 2: mfc2 MAC1/2/3, sum, mtc2 LZCS. */
|
||||||
// Note: r_recip_est first used as the sum accumulator (= |v|²), which is also what LZCS needs.
|
gte_mv_from_data_r(r_mac1_scratch, C2_MAC1),
|
||||||
gte_mv_from_data_r(r_sq_y, C2_MAC1), /* r_sq_y = MAC1 = sx² */
|
gte_mv_from_data_r(r_mac2_scratch, C2_MAC2),
|
||||||
gte_mv_from_data_r(r_sq_z, C2_MAC2), /* r_sq_z = MAC2 = sy² */
|
gte_mv_from_data_r(r_lzcr, C2_MAC3),
|
||||||
gte_mv_from_data_r(r_recip_est, C2_MAC3), /* r_recip_est = MAC3 = sz² */
|
nop,
|
||||||
nop, /* MFC2→GPR load delay (1 slot) */
|
add_u(r_lzcr, r_lzcr, r_mac2_scratch),
|
||||||
add_u(r_recip_est, r_recip_est, r_sq_z), /* r_recip_est += sy² */
|
add_u(r_lzcr, r_lzcr, r_mac1_scratch),
|
||||||
add_u(r_recip_est, r_recip_est, r_sq_y), /* r_recip_est += sx² (sum = |v|²) */
|
gte_mv_to_data_r(r_lzcr, C2_LZCS),
|
||||||
gte_mv_to_data_r( r_recip_est, C2_LZCS), /* LZCS = |v|² */
|
|
||||||
nop2,
|
nop2,
|
||||||
gte_mv_from_data_r(r_lzcr, C2_LZCR), /* r_lzcr = LZCR (count of leading bits) */
|
gte_mv_from_data_r(r_shift, C2_LZCR),
|
||||||
nop, /* MFC2→GPR load delay (1 slot) */
|
nop,
|
||||||
|
|
||||||
// ─── Stage 3: compute shift amount, align |v|² to bit 24, lookup 1/|v| ───
|
/* Stage 3: compute srav amount (r_lzcr) + align |v|² to bit 24.
|
||||||
// Matches libgte `bltz +0x10 ; nop ; b +0x14 ; sllv t4,v0,t3` pattern:
|
* IMPORTANT: the sllv/srav below writes the aligned |v|² to r_mac1_scratch (NOT r_lzcr),
|
||||||
// - bltz TAKEN → nop (BD), jump to srav_path; sllv SKIPPED
|
* so r_lzcr retains the shift count all the way to the start of stage 4.
|
||||||
// - bltz !TAKEN → nop (BD), b +0x14 jumps to aligned_done; sllv (BD of b) executes
|
*/
|
||||||
and_i( r_lzcr, r_lzcr, -2), /* r_lzcr &= ~1 (force even for halving) */
|
and_i( r_shift, r_shift, -2),
|
||||||
li_s( r_shift, 31), /* r_shift = 31 */
|
or_u(r_mac1_scratch, r_lzcr, 0), /* FIX B: save sum before clobbering r_lzcr with shift count */
|
||||||
sub_s( r_shift, r_shift, r_lzcr), /* r_shift = 31 - LZCR */
|
li_s( r_lzcr, 31),
|
||||||
shift_aright( r_shift, r_shift, 1), /* r_shift = (31 - LZCR) / 2 */
|
sub_s( r_lzcr, r_lzcr, r_shift),
|
||||||
add_si( r_tmp, r_lzcr, -24), /* r_tmp = LZCR - 24 (signed, for branch) */
|
shift_aright(r_lzcr, r_lzcr, 1),
|
||||||
branch_lt_zero(r_tmp, atom_offset(srav_path, aligned_done)), nop,
|
/* r_branch_tmp = LZCR - 24 (overwrites r_branch_tmp; src.z no longer needed after SQR) */
|
||||||
jump_rel( atom_offset(aligned_done, srav_path)),
|
add_si( r_branch_tmp, r_shift, -24),
|
||||||
shift_lleft_var(r_recip_est, r_recip_est, r_tmp), /* BD-slot of branch_equal: r_recip_est = |v|² << (LZCR - 24) */
|
branch_lt_zero(r_branch_tmp, atom_offset(aligned_done, srav_path)), nop, /* FIX A: bltz → srav_path (LZCR<24 path) */
|
||||||
atom_label(srav_path) /* SRAV path: |v|² is small (top bit < bit 24) */
|
jump_rel(atom_offset(srav_path, aligned_done)), /* FIX A: b → aligned_done (LZCR>=24 path) */
|
||||||
li_s( r_tmp, 24),
|
shift_lleft_var(r_mac1_scratch, r_mac1_scratch, r_branch_tmp), /* FIX B: src=sum (r_mac1_scratch), dst=same */
|
||||||
sub_s( r_tmp, r_tmp, r_lzcr), /* r_tmp = 24 - LZCR */
|
atom_label(srav_path)
|
||||||
shift_aright_var(r_recip_est, r_recip_est, r_tmp), /* r_recip_est = |v|² >> (24 - LZCR) */
|
li_s( r_branch_tmp, 24),
|
||||||
atom_label(aligned_done) /* Both paths converge here with |v|² aligned to bit 24 */
|
sub_s( r_branch_tmp, r_branch_tmp, r_shift),
|
||||||
/* r_recip_est now holds |v|² aligned to bit 24 — convert to byte offset, -64 to skip zero pad. */
|
shift_aright_var(r_mac1_scratch, r_mac1_scratch, r_branch_tmp), /* FIX B: src=sum (r_mac1_scratch), dst=same */
|
||||||
add_si( r_recip_est, r_recip_est, -64),
|
atom_label(aligned_done)
|
||||||
shift_lleft( r_recip_est, r_recip_est, 1), /* r_recip_est *= 2 (half-word index) */
|
/* Save the shift count to r_shift before the next 5 instructions overwrite r_lzcr
|
||||||
/* Reference OUR local sqrtbl via &-address split. Compiler/linker resolves both halves. */
|
* (the sqrtbl lookup loads 1/|v| into r_lzcr, which becomes IR0 in stage 4). */
|
||||||
load_upper_i( r_tmp, u4_hi(& gte_normalize_sqr_tbl)), /* lui */
|
or_u(r_shift, r_lzcr, 0), /* r_shift ← shift count (preserved through stage 4) */
|
||||||
or_i_self( r_tmp, u4_lo(& gte_normalize_sqr_tbl)), /* ori */
|
/* r_mac1_scratch holds |v|² aligned (top bit at bit 7). */
|
||||||
add_u( r_tmp, r_tmp, r_recip_est), /* r_tmp = sqrtbl base + byte offset (matches libgte 0x80016118: addu t5,t5,t4) */
|
add_si( r_mac1_scratch, r_mac1_scratch, -64),
|
||||||
load_half( r_recip_est, r_tmp, 0), /* r_recip_est = sqrtbl[r_recip_est] = 1/|v| estimate */
|
shift_lleft(r_mac1_scratch, r_mac1_scratch, 1),
|
||||||
nop, /* retire load_half before MTC2 (matches libgte 0x80016120: nop) */
|
load_upper_i(r_branch_tmp, u4_hi(& gte_normalize_sqr_tbl)),
|
||||||
|
or_i_self( r_branch_tmp, u4_lo(& gte_normalize_sqr_tbl)),
|
||||||
|
add_u(r_branch_tmp, r_branch_tmp, r_mac1_scratch),
|
||||||
|
load_half(r_lzcr, r_branch_tmp, 0), nop, /* r_lzcr = sqrtbl[aligned-64] = 1/|v| (IR0 in stage 4) */
|
||||||
|
|
||||||
// ─── Stage 4: mtc2 IR0..3, GPF (MAC = IR0*IR), mfc2 MAC, srav finalize ───
|
/* FIX bug C: r_branch_tmp held the sqrtbl base+index, NOT src.z. Reload src.z from scratch now that r_branch_tmp is free. */
|
||||||
// Componentized equivalent: mac_gte_gpf_scale.
|
load_word(r_branch_tmp, r_src_ptr, O_(V3_S4,z)), nop, /* r_branch_tmp = src.z (for IR3 in stage 4) */
|
||||||
gte_mv_to_data_r(r_recip_est, C2_IR0), /* IR0 = 1/|v| estimate */
|
|
||||||
gte_mv_to_data_r(r_sx, C2_IR1), /* IR1 = src.x */
|
/* Stage 4: GPF + srav finalize (r_shift = shift count, r_lzcr = 1/|v|). */
|
||||||
gte_mv_to_data_r(r_sy, C2_IR2), /* IR2 = src.y */
|
gte_mv_to_data_r(r_lzcr, C2_IR0),
|
||||||
gte_mv_to_data_r(r_sz, C2_IR3), /* IR3 = src.z */
|
gte_mv_to_data_r(r_tmp, C2_IR1), /* IR1 = src.x (preserved in r_tmp — r_mac2_scratch was clobbered to MAC2 in stage 1.5) */
|
||||||
nop2, /* COP2 transfer latency (2 slots) */
|
gte_mv_to_data_r(r_recip_est, C2_IR2),
|
||||||
gte_cmdw_gpf,
|
gte_mv_to_data_r(r_branch_tmp, C2_IR3), /* IR3 = src.z (reloaded) */
|
||||||
gte_mv_from_data_r(r_sx, C2_MAC1), /* MAC1 → r_sx (overwrites src.x with raw reciprocal-scaled) */
|
nop2, gte_cmdw_gpf,
|
||||||
gte_mv_from_data_r(r_sy, C2_MAC2),
|
gte_mv_from_data_r(r_mac2_scratch, C2_MAC1),
|
||||||
gte_mv_from_data_r(r_sz, C2_MAC3),
|
gte_mv_from_data_r(r_recip_est, C2_MAC2),
|
||||||
shift_aright_var(r_sx, r_sx, r_shift),
|
gte_mv_from_data_r(r_branch_tmp, C2_MAC3),
|
||||||
shift_aright_var(r_sy, r_sy, r_shift),
|
shift_aright_var(r_mac2_scratch, r_mac2_scratch, r_shift), /* sra by r_shift = (31-LZCR)/2 (saved before sqrtbl lookup) */
|
||||||
shift_aright_var(r_sz, r_sz, r_shift),
|
shift_aright_var(r_recip_est, r_recip_est, r_shift),
|
||||||
|
shift_aright_var(r_branch_tmp, r_branch_tmp, r_shift),
|
||||||
|
|
||||||
|
/* Store result.x/y/z to r_dst_ptr (caller-determined dst address). */
|
||||||
|
store_word(r_mac2_scratch, r_dst_ptr, O_(V3_S4,x)),
|
||||||
|
store_word(r_recip_est, r_dst_ptr, O_(V3_S4,y)),
|
||||||
|
store_word(r_branch_tmp, r_dst_ptr, O_(V3_S4,z)),
|
||||||
|
|
||||||
|
mac_yield()
|
||||||
})
|
})
|
||||||
|
|
||||||
#pragma endregion MACs (Mips Atom Components)
|
#pragma endregion Atom Procs
|
||||||
|
|
||||||
#pragma region Bsked Atoms
|
#pragma region Baked Atoms
|
||||||
|
|
||||||
typedef Struct_(Binds_SetGteMT3S2S4) {
|
typedef Struct_(Binds_SetGteMT3S2S4) {
|
||||||
MT3_S2S4* transform;
|
MT3_S2S4* transform;
|
||||||
|
|||||||
+46
-56
@@ -27,9 +27,9 @@
|
|||||||
* to author and compose programs with. From here various conventions can be further applied.
|
* to author and compose programs with. From here various conventions can be further applied.
|
||||||
* To make things easier to understand it may be better to focus on what this ABI does not have.
|
* To make things easier to understand it may be better to focus on what this ABI does not have.
|
||||||
* It does not have have any branching within the tape but relative branches within atoms or between atoms.
|
* It does not have have any branching within the tape but relative branches within atoms or between atoms.
|
||||||
* Branching nearly is always downstream. Stack usage is non-existent.
|
* Branching nearly is always downstream. Atuomatic stack usage is non-existent.
|
||||||
* Push/Pop, FIFO, or Arena/Bump data structures are used by atoms explicitly.
|
* Push/Pop, FIFO, or Arena/Bump data structures are used by atoms explicitly.
|
||||||
* In it's current form with the C11 macro dsl, the user also has fullfill manual register allocation per atom.
|
* In it's current form with the C11 macro DSL, the user also has fullfill manual register allocation per atom.
|
||||||
*
|
*
|
||||||
* One of the remarkable things about utilizing this ABI is its essentially interopable with CPUs, GPUs, FPGA,
|
* One of the remarkable things about utilizing this ABI is its essentially interopable with CPUs, GPUs, FPGA,
|
||||||
* or, basically anything from the 5th generation consoles and onward.
|
* or, basically anything from the 5th generation consoles and onward.
|
||||||
@@ -110,7 +110,7 @@ typedef U4 const MipsAtom; // Underlying type to an array of mips asm words that
|
|||||||
// FI_ void ac_X(args) MipsAtomComp_Proc_(ac_X, { body })
|
// FI_ void ac_X(args) MipsAtomComp_Proc_(ac_X, { body })
|
||||||
// expands to:
|
// expands to:
|
||||||
// FI_ void ac_X(args) { MipsCode ac_X[] align_(4) = { body }; return ac_X; }
|
// FI_ void ac_X(args) { MipsCode ac_X[] align_(4) = { body }; return ac_X; }
|
||||||
#define MipsAtom_Proc_(sym, abuilder, ...) { MipsCode sym [] align_(4) = __VA_ARGS__; atombuilder_unroll(abuilder, slice_from_array(MipsCode, sym)); }
|
#define MipsAtom_Proc_(sym, aa, ...) { MipsCode sym [] align_(4) = __VA_ARGS__; return atomarena_push(aa, slice_from_array(MipsCode, sym)); }
|
||||||
|
|
||||||
// Used for components with no args (e.g., ac_load_tri_indices) or identifier-args (hardcoded register names).
|
// Used for components with no args (e.g., ac_load_tri_indices) or identifier-args (hardcoded register names).
|
||||||
// MipsAtomComp_(ac_X) { body }
|
// MipsAtomComp_(ac_X) { body }
|
||||||
@@ -118,25 +118,20 @@ typedef U4 const MipsAtom; // Underlying type to an array of mips asm words that
|
|||||||
// MipsCode ac_X[] align_(4) = { body };
|
// MipsCode ac_X[] align_(4) = { body };
|
||||||
#define MipsAtomComp_(sym) MipsCode sym [] align_(4) =
|
#define MipsAtomComp_(sym) MipsCode sym [] align_(4) =
|
||||||
|
|
||||||
// Used for components with value-args (e.g., ac_format_f3_color).
|
// Used for components with value-args (mandatory `ab` (atom-builder) arg).
|
||||||
// FI_ Slice_MipsCode ac_X(args) MipsAtomComp_Proc_(ac_X, { body })
|
// FI_ void ac_X(MipsAtomBuilder_R ab, args) MipsAtomComp_Proc_(ac_X, ab, { body })
|
||||||
// expands to:
|
// expands to:
|
||||||
// FI_ Slice_MipsCode ac_X(args) { MipsCode ac_X[] align_(4) = { body }; return slice_from_array(MipsCode, ac_X); }
|
// FI_ void ac_X(MipsAtomBuilder_R ab, args) {
|
||||||
#define MipsAtomComp_Proc_(sym, ...) { MipsCode sym [] align_(4) = __VA_ARGS__; return slice_from_array(MipsCode, sym); }
|
// MipsCode ac_X[] align_(4) = { body };
|
||||||
|
// atombuilder_unroll(ab, slice_from_array(MipsCode, ac_X));
|
||||||
// Used for components with value-args (e.g., ac_format_f3_color).
|
// }
|
||||||
// FI_ Slice_MipsCode ac_X(args) MipsAtomComp_Proc_(ac_X, { body })
|
// The body must NOT include mac_yield() (the parent atom yields).
|
||||||
// expands to:
|
// Inline-only callers (the generated `mac_<name>` aliases) skip this arg via metaprogram filtering;
|
||||||
// FI_ Slice_MipsCode ac_X(args) { MipsCode ac_X[] align_(4) = { body }; return slice_from_array(MipsCode, ac_X); }
|
// escape callers (ac_<name> invoked as a function) pass a long-lived builder.
|
||||||
// #define MipsAtomComp_Proc_(sym, abuilder, ...) { MipsCode sym [] align_(4) = __VA_ARGS__; atombuilder_unroll(abuilder, slice_from_array(MipsCode, sym)); }
|
#define MipsAtomComp_Proc_(sym, ab, ...) { MipsCode sym [] align_(4) = __VA_ARGS__; atombuilder_push(ab, slice_from_array(MipsCode, sym)); }
|
||||||
|
|
||||||
/* Line-table anchor: gcc only adds a file to the .debug_line file table when the contains line-numbered content.
|
/* Line-table anchor: gcc only adds a file to the .debug_line file table when the contains line-numbered content.
|
||||||
Files containing only:
|
Files containing only atoms and atom components.
|
||||||
- `MipsAtomComp_` static-array declarations, or
|
|
||||||
- `MipsAtomComp_Proc_` (force-inline) function bodies whose line info gets
|
|
||||||
attributed to the call site at the include point are otherwise omitted from the file table,
|
|
||||||
which breaks the DWARF injection when it tries to resolve atom-component provenance paths.
|
|
||||||
|
|
||||||
Place `ATOM_FILE_LINE_MARKER();` once at file scope in any `.atom.c` that defines atoms.
|
Place `ATOM_FILE_LINE_MARKER();` once at file scope in any `.atom.c` that defines atoms.
|
||||||
The macro expands to a file-scope `internal U4 const` declaration keeps the file in the line table.
|
The macro expands to a file-scope `internal U4 const` declaration keeps the file in the line table.
|
||||||
The constant is in `.rodata` and unreferenced; the linker may eliminate it.
|
The constant is in `.rodata` and unreferenced; the linker may eliminate it.
|
||||||
@@ -191,14 +186,14 @@ FI_ void tape_run_a02_s07(Tape tape) { register U4* tape_ptr rgcc(R_TapePtr) = u
|
|||||||
typedef Relative_(FArena) Struct_(TapeBuilder) { U4 ptr; U4 capacity; U4 used; };
|
typedef Relative_(FArena) Struct_(TapeBuilder) { U4 ptr; U4 capacity; U4 used; };
|
||||||
FI_ void tb_init(TapeBuilder* tb, FArena* arena) { tb->ptr = arena->start; tb->used = 0; }
|
FI_ void tb_init(TapeBuilder* tb, FArena* arena) { tb->ptr = arena->start; tb->used = 0; }
|
||||||
FI_ TapeBuilder tb_make_old( FArena* arena) { return (TapeBuilder){ arena->start, 0 }; }
|
FI_ TapeBuilder tb_make_old( FArena* arena) { return (TapeBuilder){ arena->start, 0 }; }
|
||||||
FI_ TapeBuilder tb_make(Slice mem) { return (TapeBuilder){ mem.ptr, mem.len, 0 }; }
|
FI_ TapeBuilder tb_make(Slice mem) { return (TapeBuilder){ u4_(mem.ptr), mem.len, 0 }; } /* capacity in elements (matches used units) */
|
||||||
|
|
||||||
FI_ void tb_emit(TapeBuilder* tb, MipsAtom* atom) { u4_r(tb->ptr)[tb->used] = u4_(atom); ++ tb->used; }
|
FI_ void tb_emit(TapeBuilder* tb, MipsAtom* atom) { u4_r(tb->ptr)[tb->used] = u4_(atom); ++ tb->used; }
|
||||||
FI_ void tb_data(TapeBuilder* tb, U4 data) { u4_r(tb->ptr)[tb->used] = u4_(data); ++ tb->used; }
|
FI_ void tb_data(TapeBuilder* tb, U4 data) { u4_r(tb->ptr)[tb->used] = u4_(data); ++ tb->used; }
|
||||||
#define tb_emit_(atom) tb_emit(& tb, atom)
|
#define tb_emit_(atom) tb_emit(& tb, atom)
|
||||||
#define tb_data_(field, data) tb_data(& tb, u4_(data))
|
#define tb_data_(field, data) tb_data(& tb, u4_(data))
|
||||||
|
|
||||||
FI_ void tb_emit_bundle(TapeBuilder_R tb, Slice_MipsAtom atoms) { mem_copy(u4_(tb->ptr), u4_(atoms.ptr), tb->used); tb->used += atoms.len; }
|
FI_ void tb_emit_bundle(TapeBuilder_R tb, Slice_MipsAtom atoms) { mem_copy(u4_(tb->ptr), u4_(atoms.ptr), S_slice(atoms)); tb->used += atoms.len; }
|
||||||
|
|
||||||
FI_ Tape tb_end (TapeBuilder* tb) { tb_emit(tb,tape_exit); return (Tape){ C_(U4*,tb->ptr), tb->used }; }
|
FI_ Tape tb_end (TapeBuilder* tb) { tb_emit(tb,tape_exit); return (Tape){ C_(U4*,tb->ptr), tb->used }; }
|
||||||
FI_ Tape tb_slice(TapeBuilder tb) { return (Tape){ C_(U4*,tb.ptr), tb.used }; }
|
FI_ Tape tb_slice(TapeBuilder tb) { return (Tape){ C_(U4*,tb.ptr), tb.used }; }
|
||||||
@@ -234,59 +229,54 @@ atom_dbg_skip MipsAtomComp_(ac_yield_tail) {
|
|||||||
add_ui_self(R_TapePtr, S_(MipsCode)),
|
add_ui_self(R_TapePtr, S_(MipsCode)),
|
||||||
jump_reg( R_AtomJmp), nop,
|
jump_reg( R_AtomJmp), nop,
|
||||||
};
|
};
|
||||||
|
|
||||||
#pragma endregion Macro Atom Components
|
#pragma endregion Macro Atom Components
|
||||||
|
|
||||||
#pragma region Mips Atom Builder
|
#pragma region Atom Builder
|
||||||
// This helps with runtime procedural authoring of mips atoms.
|
// This helps with runtime procedural authoring of mips atoms.
|
||||||
|
|
||||||
typedef Struct_(FMipsAtom512) { U4 data[512]; U4 used; };
|
typedef Struct_(FMipsAtom512) { U4 data[512]; U4 used; };
|
||||||
|
|
||||||
// FArena Related
|
// FArena Related
|
||||||
typedef Relative_(FArena) Struct_(MipsAtomBuilder) { U4 start; U4 capacity; U4 used; };
|
typedef Relative_(FArena) Struct_(AtomBuilder) { U4 start; U4 capacity; U4 used; };
|
||||||
// Whatever the builder is writting to should most likely coresspond
|
|
||||||
// to something that can fit within instruction cache?
|
|
||||||
|
|
||||||
FI_ void atombuilder_unroll(MipsAtomBuilder_R ab, Slice_MipsCode code) {
|
// Usual way to resolve an atom after the bulder is done.
|
||||||
|
#define atom_from_atombuilder(ab) C_(MipsAtom*, (ab).start)
|
||||||
|
|
||||||
|
FI_ void atombuilder_push(AtomBuilder_R ab, Slice_MipsCode code) {
|
||||||
assert(ab->capacity - ab->used - code.len);
|
assert(ab->capacity - ab->used - code.len);
|
||||||
mem_copy(ab->start, u4_(code.ptr), code.len);
|
U4 dest = ab->start + ab->used * S_(MipsCode);
|
||||||
|
mem_copy(dest, u4_(code.ptr), S_slice(code));
|
||||||
mem_bump(ab->start, ab->capacity, & ab->used, code.len);
|
mem_bump(ab->start, ab->capacity, & ab->used, code.len);
|
||||||
}
|
}
|
||||||
#define atombuilder_unroll_mac(ab, mac) atombuilder_unroll(ab, slice_arg_from_array(Slice_MipsCode, mac))
|
#define atombuilder_push_mac(ab, mac) atombuilder_push(ab, slice_arg_from_array(Slice_MipsCode, mac))
|
||||||
|
|
||||||
// When done authoring, utilize this to cap-off the atom (if not utilizing a MipsAtom_Proc).
|
// When done authoring, utilize this to cap-off the atom (if not utilizing a MipsAtom_Proc).
|
||||||
FI_ void atombuilder_end(MipsAtomBuilder_R ab) {
|
FI_ void atombuilder_end(AtomBuilder_R ab) { atombuilder_push(ab, slice_from_array(MipsCode, ac_yield)); }
|
||||||
mem_copy(ab->start, u4_(ac_yield), S_(ac_yield));
|
|
||||||
mem_bump(ab->start, ab->capacity, & ab->used, S_(ac_yield));
|
|
||||||
}
|
|
||||||
|
|
||||||
#define mipsatom_from_builder(ab) C_(MipsAtom*, (ab).start)
|
FI_ void tb_emit_atombuilder(TapeBuilder_R tb, AtomBuilder_R ab) { tb_emit(tb, atom_from_atombuilder(ab[0])); }
|
||||||
#pragma endregion Mips Atom Builder
|
#pragma endregion Mips Atom Builder
|
||||||
|
|
||||||
#pragma region Mips Atom Procs
|
#pragma region Atom Arena
|
||||||
|
typedef Relative_(FArena) Struct_(AtomArena) { U4 start; U4 capacity; U4 used; };
|
||||||
|
|
||||||
#if 0
|
#define atomarena_unused_start(ab) ((ab).start + (ab).used * S_(MipsCode))
|
||||||
typedef Struct_(Binds_SyncPrimitiveArena) { U4 used; U4 cursor; };
|
FI_ void atomarena_init(AtomArena_R arena, Slice mem) { assert(arena != nullptr);
|
||||||
FI_ void sync_prim_arean_proc_demo(MipsAtomBuilder_R ab, U4 r_extra, U4 add_amnt_extra)
|
arena->start = u4_(mem.ptr);
|
||||||
MipsAtom_Proc_(sync_primitive_arena_proc_demo, ab, atom_info(atom_bind(Binds_SyncPrimitiveArena)
|
arena->capacity = mem.len;
|
||||||
, atom_reads( R_TapePtr, R_PrimCursor)
|
arena->used = 0;
|
||||||
, atom_writes(R_TapePtr)
|
|
||||||
){
|
|
||||||
load_word(R_AT, R_TapePtr, O_(Binds_SyncPrimitiveArena,used)),
|
|
||||||
load_word(R_T0, R_TapePtr, O_(Binds_SyncPrimitiveArena,cursor)),
|
|
||||||
add_ui_self( R_TapePtr, S_(Binds_SyncPrimitiveArena)),
|
|
||||||
/* Calculate byte offset and store directly back to RAM */
|
|
||||||
sub_u( R_T0, R_PrimCursor, R_T0), // R_T0 = R_PrimCursor - binds.cursor
|
|
||||||
store_word(R_T0, R_AT, 0), // R_AT[0] = R_T0
|
|
||||||
add_ui_self(r_extra, add_amnt_extra), // extra op for demonstration purposes.
|
|
||||||
mac_yield()
|
|
||||||
})
|
|
||||||
|
|
||||||
void demo_make_make_and_emit_atom(TapeBuilder* tb, MipsAtomBuilder* ab){
|
|
||||||
sync_prim_arean_proc_demo(ab, R_T4, 4);
|
|
||||||
tb_emit(tb, mipsatom_from_builder(ab[0]));
|
|
||||||
}
|
}
|
||||||
#endif
|
FI_ AtomArena atomarena_make(Slice mem) { AtomArena a; atomarena_init(& a, mem); return a; }
|
||||||
|
FI_ MipsAtom* atomarena_push(AtomArena_R aa, Slice_MipsCode code) {
|
||||||
|
assert(aa->capacity - aa->used - code.len);
|
||||||
|
U4 dest = atomarena_unused_start(aa[0]);
|
||||||
|
mem_copy(dest, u4_(code.ptr), S_slice(code));
|
||||||
|
mem_bump(aa->start, aa->capacity, & aa->used, code.len);
|
||||||
|
return C_(MipsAtom*, dest);
|
||||||
|
}
|
||||||
|
FI_ void atomarena_reset(AtomArena_R aa) { aa->used = 0; }
|
||||||
|
#pragma region Atom Arena
|
||||||
|
|
||||||
|
#pragma region Mips Atom Procs
|
||||||
|
|
||||||
#pragma endregion Mips Atom Procs
|
#pragma endregion Mips Atom Procs
|
||||||
|
|
||||||
|
|||||||
@@ -9,35 +9,35 @@ ATOM_FILE_DEBUGGER_LINE_MARKER(math_atom_c);
|
|||||||
|
|
||||||
#pragma region MACs (Mips Atom Component)
|
#pragma region MACs (Mips Atom Component)
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_load_v2s2(U4 rs_x, U4 rs_y, U4 r_base, U4 offset) atom_dbg_skip MipsAtomComp_Proc_(ac_load_v2s2, {
|
FI_ Slice_MipsCode ac_load_v2s2(AtomBuilder_R ab, U4 rs_x, U4 rs_y, U4 r_base, U4 offset) atom_dbg_skip MipsAtomComp_Proc_(ac_load_v2s2, ab, {
|
||||||
load_half( rs_x, r_base, O_(V3_S2,x)),
|
load_half( rs_x, r_base, O_(V3_S2,x)),
|
||||||
load_half( rs_y, r_base, O_(V3_S2,y)),
|
load_half( rs_y, r_base, O_(V3_S2,y)),
|
||||||
})
|
})
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_store_v2s2(U4 rt_x, U4 rt_y, U4 base, U4 offset) atom_dbg_skip MipsAtomComp_Proc_(ac_store_v2s2, {
|
FI_ Slice_MipsCode ac_store_v2s2(AtomBuilder_R ab, U4 rt_x, U4 rt_y, U4 base, U4 offset) atom_dbg_skip MipsAtomComp_Proc_(ac_store_v2s2, ab, {
|
||||||
store_half(rt_x, base, offset + O_(V2_S2,x)),
|
store_half(rt_x, base, offset + O_(V2_S2,x)),
|
||||||
store_half(rt_y, base, offset + O_(V2_S2,y)),
|
store_half(rt_y, base, offset + O_(V2_S2,y)),
|
||||||
})
|
})
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_load_v3s4(U4 rs_x, U4 rs_y, U4 rs_z, U4 r_base, U4 offset) atom_dbg_skip MipsAtomComp_Proc_(ac_load_v3s4, {
|
FI_ Slice_MipsCode ac_load_v3s4(AtomBuilder_R ab, U4 rs_x, U4 rs_y, U4 rs_z, U4 r_base, U4 offset) atom_dbg_skip MipsAtomComp_Proc_(ac_load_v3s4, ab, {
|
||||||
load_word( rs_x, r_base, O_(V3_S4,x)),
|
load_word( rs_x, r_base, O_(V3_S4,x)),
|
||||||
load_word( rs_y, r_base, O_(V3_S4,y)),
|
load_word( rs_y, r_base, O_(V3_S4,y)),
|
||||||
load_word( rs_z, r_base, O_(V3_S4,z)),
|
load_word( rs_z, r_base, O_(V3_S4,z)),
|
||||||
})
|
})
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_store_v3s4(U4 rt_x, U4 rt_y, U4 rt_z, U4 base, U4 offset) atom_dbg_skip MipsAtomComp_Proc_(ac_store_v3s4, {
|
FI_ Slice_MipsCode ac_store_v3s4(AtomBuilder_R ab, U4 rt_x, U4 rt_y, U4 rt_z, U4 base, U4 offset) atom_dbg_skip MipsAtomComp_Proc_(ac_store_v3s4, ab, {
|
||||||
store_word(rt_x, base, offset + O_(V3_S4,x)),
|
store_word(rt_x, base, offset + O_(V3_S4,x)),
|
||||||
store_word(rt_y, base, offset + O_(V3_S4,y)),
|
store_word(rt_y, base, offset + O_(V3_S4,y)),
|
||||||
store_word(rt_z, base, offset + O_(V3_S4,z)),
|
store_word(rt_z, base, offset + O_(V3_S4,z)),
|
||||||
})
|
})
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_sub_v3s4(U4 rds_x, U4 rds_y, U4 rds_z, U4 rt_x, U4 rt_y, U4 rt_z) atom_dbg_skip MipsAtomComp_Proc_(ac_sub_v3s4, {
|
FI_ Slice_MipsCode ac_sub_v3s4(AtomBuilder_R ab, U4 rds_x, U4 rds_y, U4 rds_z, U4 rt_x, U4 rt_y, U4 rt_z) atom_dbg_skip MipsAtomComp_Proc_(ac_sub_v3s4, ab, {
|
||||||
sub_s(rds_x, rds_x, rt_x),
|
sub_s(rds_x, rds_x, rt_x),
|
||||||
sub_s(rds_y, rds_y, rt_y),
|
sub_s(rds_y, rds_y, rt_y),
|
||||||
sub_s(rds_z, rds_z, rt_z),
|
sub_s(rds_z, rds_z, rt_z),
|
||||||
})
|
})
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_store_rects2(U4 rt_x, U4 rt_y, U4 rt_width, U4 rt_height, U4 base, U4 offset) atom_dbg_skip MipsAtomComp_Proc_(ac_store_rects2, {
|
FI_ Slice_MipsCode ac_store_rects2(AtomBuilder_R ab, U4 rt_x, U4 rt_y, U4 rt_width, U4 rt_height, U4 base, U4 offset) atom_dbg_skip MipsAtomComp_Proc_(ac_store_rects2, ab, {
|
||||||
store_half(rt_x, base, offset + O_(Rect_S2,x)),
|
store_half(rt_x, base, offset + O_(Rect_S2,x)),
|
||||||
store_half(rt_y, base, offset + O_(Rect_S2,y)),
|
store_half(rt_y, base, offset + O_(Rect_S2,y)),
|
||||||
store_half(rt_width, base, offset + O_(Rect_S2,width)),
|
store_half(rt_width, base, offset + O_(Rect_S2,width)),
|
||||||
|
|||||||
+11
-9
@@ -58,13 +58,13 @@ typedef Struct_(Str8) { UTF8* ptr; U4 len; };
|
|||||||
typedef Struct_(Slice_Str8) { Str8* ptr; U4 len; };
|
typedef Struct_(Slice_Str8) { Str8* ptr; U4 len; };
|
||||||
#define slit(string_literal) (Str8){ (UTF8*) string_literal, S_(string_literal) - 1 }
|
#define slit(string_literal) (Str8){ (UTF8*) string_literal, S_(string_literal) - 1 }
|
||||||
|
|
||||||
typedef Struct_(Slice) { U4 ptr, len; }; // Untyped Slice
|
typedef Struct_(Slice) { B1* ptr; U4 len; }; // Untyped Slice (byte-addressable; .len in elements)
|
||||||
FI_ Slice slice_ut_(U4 ptr, U4 len) { return (Slice){ptr, len}; }
|
FI_ Slice slice_ut_(U4 ptr, U4 len) { return (Slice){(B1*)ptr, len}; }
|
||||||
|
|
||||||
#define Slice_(type) Struct_(tmpl(Slice,type)) { type* ptr; U4 len; }
|
#define Slice_(type) Struct_(tmpl(Slice,type)) { type* ptr; U4 len; }
|
||||||
typedef Slice_(B1);
|
typedef Slice_(B1);
|
||||||
#define slice_assert(s) do { assert((s).ptr != 0); assert((s).len > 0); } while(0)
|
#define slice_assert(s) do { assert((s).ptr != 0); assert((s).len > 0); } while(0)
|
||||||
#define slice_end(slice) ((slice).ptr + (slice).len)
|
#define slice_end(slice) ((slice).ptr + S_slice(slice) / S_(B1)) /* byte-ptr arithmetic; .len is in elements per slice convention */
|
||||||
#define S_slice(s) ((s).len * S_((s).ptr[0]))
|
#define S_slice(s) ((s).len * S_((s).ptr[0]))
|
||||||
|
|
||||||
#define slice_ut(ptr,len) slice_ut_(u4_(ptr), u4_(len))
|
#define slice_ut(ptr,len) slice_ut_(u4_(ptr), u4_(len))
|
||||||
@@ -73,22 +73,23 @@ typedef Slice_(B1);
|
|||||||
|
|
||||||
#define slice_iter(container, iter) (T_((container).ptr) iter = (container).ptr; iter != slice_end(container); ++ iter)
|
#define slice_iter(container, iter) (T_((container).ptr) iter = (container).ptr; iter != slice_end(container); ++ iter)
|
||||||
#define slice_arg_from_array(type, ...) & (tmpl(Slice,type)) { .ptr = array_decl(type,__VA_ARGS__), .len = array_len( array_decl(type,__VA_ARGS__)) }
|
#define slice_arg_from_array(type, ...) & (tmpl(Slice,type)) { .ptr = array_decl(type,__VA_ARGS__), .len = array_len( array_decl(type,__VA_ARGS__)) }
|
||||||
#define slice_from_array(type, array) (tmpl(Slice,type)) { .ptr = array, .len = S_(array) }
|
#define slice_from_array(type, array) (tmpl(Slice,type)) { .ptr = array, .len = S_(array) / S_(type) }
|
||||||
|
|
||||||
FI_ void slice_zero_(Slice s) { slice_assert(s); mem_zero(s.ptr, s.len); }
|
FI_ void slice_zero_(Slice s) { slice_assert(s); mem_zero(u4_(s.ptr), s.len); }
|
||||||
#define slice_zero(s) slice_zero_(slice_to_ut(s))
|
#define slice_zero(s) slice_zero_(slice_to_ut(s))
|
||||||
|
|
||||||
FI_ void slice_copy_(Slice dest, Slice src) {
|
FI_ void slice_copy_(Slice dest, Slice src) {
|
||||||
assert(dest.len >= src.len);
|
assert(S_slice(dest) >= S_slice(src));
|
||||||
slice_assert(dest);
|
slice_assert(dest);
|
||||||
slice_assert(src);
|
slice_assert(src);
|
||||||
mem_copy(dest.ptr, src.ptr, src.len);
|
mem_copy(u4_(dest.ptr), u4_(src.ptr), S_slice(src));
|
||||||
}
|
}
|
||||||
#define slice_copy(dest, src) do { \
|
#define slice_copy(dest, src) do { \
|
||||||
static_assert(T_same(dest, src)); \
|
static_assert(T_same(dest, src)); \
|
||||||
slice_copy_(slice_to_ut(dest), slice_to_ut(src)); \
|
slice_copy_(slice_to_ut(dest), slice_to_ut(src)); \
|
||||||
} while(0)
|
} while(0)
|
||||||
|
|
||||||
|
typedef Slice_(U1);
|
||||||
typedef Slice_(U4);
|
typedef Slice_(U4);
|
||||||
|
|
||||||
#pragma endregion Slice
|
#pragma endregion Slice
|
||||||
@@ -98,7 +99,7 @@ typedef Slice_(U4);
|
|||||||
typedef Opt_(farena) { U4 alignment, type_width; };
|
typedef Opt_(farena) { U4 alignment, type_width; };
|
||||||
typedef Struct_(FArena) { U4 start, capacity, used; };
|
typedef Struct_(FArena) { U4 start, capacity, used; };
|
||||||
FI_ void farena_init(FArena_R arena, Slice mem) { assert(arena != nullptr);
|
FI_ void farena_init(FArena_R arena, Slice mem) { assert(arena != nullptr);
|
||||||
arena->start = mem.ptr;
|
arena->start = u4_(mem.ptr);
|
||||||
arena->capacity = mem.len;
|
arena->capacity = mem.len;
|
||||||
arena->used = 0;
|
arena->used = 0;
|
||||||
}
|
}
|
||||||
@@ -109,7 +110,7 @@ I_ Slice farena_push(FArena_R arena, U4 amount, Opt_farena o) {
|
|||||||
U4 to_commit = align_pow2(desired, o.alignment ? o.alignment : MEM_ALIGNMENT_DEFAULT);
|
U4 to_commit = align_pow2(desired, o.alignment ? o.alignment : MEM_ALIGNMENT_DEFAULT);
|
||||||
U4 ptr = arena->start + arena->used;
|
U4 ptr = arena->start + arena->used;
|
||||||
mem_bump(arena->start, arena->capacity, & arena->used, to_commit);
|
mem_bump(arena->start, arena->capacity, & arena->used, to_commit);
|
||||||
return (Slice){ ptr, to_commit };
|
return (Slice){ (B1*)ptr, to_commit };
|
||||||
}
|
}
|
||||||
FI_ void farena_reset (FArena_R arena) { arena->used = 0; }
|
FI_ void farena_reset (FArena_R arena) { arena->used = 0; }
|
||||||
FI_ void farena_rewind(FArena_R arena, U4 save_point) {
|
FI_ void farena_rewind(FArena_R arena, U4 save_point) {
|
||||||
@@ -117,6 +118,7 @@ FI_ void farena_rewind(FArena_R arena, U4 save_point) {
|
|||||||
arena->used -= save_point - arena->start;
|
arena->used -= save_point - arena->start;
|
||||||
}
|
}
|
||||||
FI_ U4 farena_save(FArena arena) { return arena.used; }
|
FI_ U4 farena_save(FArena arena) { return arena.used; }
|
||||||
|
FI_ U4 farena_unused_start(FArena arena) { return arena.start + arena.used; }
|
||||||
#define farena_push_(arena, amount, ...) farena_push((arena), (amount), opt_(farena, __VA_ARGS__))
|
#define farena_push_(arena, amount, ...) farena_push((arena), (amount), opt_(farena, __VA_ARGS__))
|
||||||
#define farena_push_type(arena, type, ...) C_(type*, farena_push((arena), 1, opt_(farena, .type_width=S_(type), __VA_ARGS__)).ptr)
|
#define farena_push_type(arena, type, ...) C_(type*, farena_push((arena), 1, opt_(farena, .type_width=S_(type), __VA_ARGS__)).ptr)
|
||||||
#define farena_push_array(arena, type, amount, ...) (tmpl(Slice,type)){ C_(type*, farena_push((arena), (amount), opt_(farena, .type_width=S_(type), __VA_ARGS__)).ptr), (amount) }
|
#define farena_push_array(arena, type, amount, ...) (tmpl(Slice,type)){ C_(type*, farena_push((arena), (amount), opt_(farena, .type_width=S_(type), __VA_ARGS__)).ptr), (amount) }
|
||||||
|
|||||||
@@ -11,18 +11,18 @@ ATOM_FILE_DEBUGGER_LINE_MARKER(pad_atom_c);
|
|||||||
|
|
||||||
#pragma region MACs (Mips Atom Components)
|
#pragma region MACs (Mips Atom Components)
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_pad_set_centered_axes(U4 r_state, U4 r_scratch) atom_dbg_skip MipsAtomComp_Proc_(ac_pad_set_centered_axes, {
|
FI_ Slice_MipsCode ac_pad_set_centered_axes(AtomBuilder_R ab, U4 r_state, U4 r_scratch) atom_dbg_skip MipsAtomComp_Proc_(ac_pad_set_centered_axes, ab, {
|
||||||
load_upper_i(r_scratch, (PadAxis_Centered_Word >> 16) & 0xFFFF),
|
load_upper_i(r_scratch, (PadAxis_Centered_Word >> 16) & 0xFFFF),
|
||||||
or_i_self( r_scratch, PadAxis_Centered_Word & 0xFFFF),
|
or_i_self( r_scratch, PadAxis_Centered_Word & 0xFFFF),
|
||||||
store_word( r_scratch, r_state, O_(PadState,axes)),
|
store_word( r_scratch, r_state, O_(PadState,axes)),
|
||||||
})
|
})
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_pad_set_id_byte(U1 r_state, U1 r_id, U1 id_value) atom_dbg_skip MipsAtomComp_Proc_(ac_pad_set_id_byte, {
|
FI_ Slice_MipsCode ac_pad_set_id_byte(AtomBuilder_R ab, U1 r_state, U1 r_id, U1 id_value) atom_dbg_skip MipsAtomComp_Proc_(ac_pad_set_id_byte, ab, {
|
||||||
add_ui( r_id, R_0, id_value),
|
add_ui( r_id, R_0, id_value),
|
||||||
store_byte(r_id, r_state, O_(PadState,id)),
|
store_byte(r_id, r_state, O_(PadState,id)),
|
||||||
})
|
})
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_pad_set_status(U4 r_tmp, U1 r_state, U4 pad_status) atom_dbg_skip MipsAtomComp_Proc_(ac_pad_set_status, {
|
FI_ Slice_MipsCode ac_pad_set_status(AtomBuilder_R ab, U4 r_tmp, U1 r_state, U4 pad_status) atom_dbg_skip MipsAtomComp_Proc_(ac_pad_set_status, ab, {
|
||||||
add_ui( r_tmp, R_0, pad_status),
|
add_ui( r_tmp, R_0, pad_status),
|
||||||
store_word(r_tmp, r_state, O_(PadState,status)),
|
store_word(r_tmp, r_state, O_(PadState,status)),
|
||||||
})
|
})
|
||||||
@@ -30,7 +30,7 @@ FI_ Slice_MipsCode ac_pad_set_status(U4 r_tmp, U1 r_state, U4 pad_status) atom_d
|
|||||||
/* Invert r_buttons (active-low → active-high) and store to PadState.buttons.
|
/* Invert r_buttons (active-low → active-high) and store to PadState.buttons.
|
||||||
* r_buttons must already be loaded (the caller is responsible for filling the load-delay slot of
|
* r_buttons must already be loaded (the caller is responsible for filling the load-delay slot of
|
||||||
* the preceding load_half_u with an instruction that doesn't read r_buttons). */
|
* the preceding load_half_u with an instruction that doesn't read r_buttons). */
|
||||||
FI_ Slice_MipsCode ac_pad_store_inverted_buttons(U1 r_buttons, U1 r_pad_state) atom_dbg_skip MipsAtomComp_Proc_(ac_pad_store_inverted_buttons, {
|
FI_ Slice_MipsCode ac_pad_store_inverted_buttons(AtomBuilder_R ab, U1 r_buttons, U1 r_pad_state) atom_dbg_skip MipsAtomComp_Proc_(ac_pad_store_inverted_buttons, ab, {
|
||||||
nor_u( r_buttons, r_buttons, R_0),
|
nor_u( r_buttons, r_buttons, R_0),
|
||||||
store_half( r_buttons, r_pad_state, O_(PadState, buttons)),
|
store_half( r_buttons, r_pad_state, O_(PadState, buttons)),
|
||||||
})
|
})
|
||||||
@@ -93,7 +93,7 @@ atom_label(disconnected) /* === Disconnected body. */
|
|||||||
mac_pad_set_status(R_T4, R_PadState, PadStatus_Disconnected),
|
mac_pad_set_status(R_T4, R_PadState, PadStatus_Disconnected),
|
||||||
store_half( R_0, R_PadState, O_(PadState,buttons)),
|
store_half( R_0, R_PadState, O_(PadState,buttons)),
|
||||||
mac_pad_set_centered_axes(R_PadState, R_T4),
|
mac_pad_set_centered_axes(R_PadState, R_T4),
|
||||||
mac_pad_set_id_byte( R_PadState, R_RawId, PadRawStatus_Timeout),
|
mac_pad_set_id_byte(R_PadState, R_RawId, PadRawStatus_Timeout),
|
||||||
jump_rel(atom_offset(disconnected, snap_end)),
|
jump_rel(atom_offset(disconnected, snap_end)),
|
||||||
/* BD-slot: load next atom's entry point (replaces the nop).
|
/* BD-slot: load next atom's entry point (replaces the nop).
|
||||||
* Always jumps to snap_end, where mac_yield_tail() transfers control to R_AtomJmp without re-loading it. */
|
* Always jumps to snap_end, where mac_yield_tail() transfers control to R_AtomJmp without re-loading it. */
|
||||||
@@ -181,7 +181,7 @@ atom_label(try_unsupported) /* === Case 7: Unsupported — fall through from the
|
|||||||
store_word(R_T4, R_PadState, O_(PadState,status)),
|
store_word(R_T4, R_PadState, O_(PadState,status)),
|
||||||
store_half(R_0, R_PadState, O_(PadState,buttons)),
|
store_half(R_0, R_PadState, O_(PadState,buttons)),
|
||||||
mac_pad_set_centered_axes(R_PadState, R_T4),
|
mac_pad_set_centered_axes(R_PadState, R_T4),
|
||||||
mac_pad_set_id_byte( R_PadState, R_RawId, PadUnknownId_Sentinel),
|
mac_pad_set_id_byte(R_PadState, R_RawId, PadUnknownId_Sentinel),
|
||||||
/* Fall through to snap_end. */
|
/* Fall through to snap_end. */
|
||||||
|
|
||||||
atom_label(no_jump_fallthrough)
|
atom_label(no_jump_fallthrough)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#ifdef INTELLISENSE_DIRECTIVES
|
#ifdef INTELLISENSE_DIRECTIVES
|
||||||
# pragma once
|
# pragma once
|
||||||
# include "dsl.h"
|
# include "dsl.h"
|
||||||
|
# include "math.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* PSX button bit positions — 1:1 with PSX-SPX docs at docs/psx-spx/docs/controllersandmemorycards.md:405-421.
|
/* PSX button bit positions — 1:1 with PSX-SPX docs at docs/psx-spx/docs/controllersandmemorycards.md:405-421.
|
||||||
|
|||||||
@@ -15,6 +15,8 @@
|
|||||||
#define WORD_COUNT(name, count) enum { words_##name = (count) };
|
#define WORD_COUNT(name, count) enum { words_##name = (count) };
|
||||||
|
|
||||||
WORD_COUNT(nop, 1)
|
WORD_COUNT(nop, 1)
|
||||||
|
WORD_COUNT(atom_label, 0)
|
||||||
|
WORD_COUNT(atom_offset, 0)
|
||||||
WORD_COUNT(load_upper_i, 1)
|
WORD_COUNT(load_upper_i, 1)
|
||||||
WORD_COUNT(jump_reg, 1)
|
WORD_COUNT(jump_reg, 1)
|
||||||
WORD_COUNT(jump_link, 1)
|
WORD_COUNT(jump_link, 1)
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
#ifdef INTELLISENSE_DIRECTIVES
|
||||||
|
#pragma once
|
||||||
|
#endif
|
||||||
|
// Auto-generated by ps1_meta.lua (passes/auto_reg.lua) — DO NOT EDIT
|
||||||
|
// Directory: C:\projects\Pikuma\ps1\code\hello_camera
|
||||||
|
// source: C:/projects/Pikuma/ps1/code/hello_camera/hello_camera.c
|
||||||
|
// source: C:/projects/Pikuma/ps1/code/hello_camera/hello_camera.h
|
||||||
|
// source: C:/projects/Pikuma/ps1/code/hello_camera/hello_camera.atom.c
|
||||||
|
// Per-phase register allocations resolved by the lua pass.
|
||||||
|
// R_<Sym>_Code = <chosen GPR's _Code constant> for every marker in this directory.
|
||||||
|
|
||||||
|
#define R_GpTmp_Code R_V0_Code
|
||||||
|
|
||||||
@@ -17,6 +17,7 @@
|
|||||||
# include "duffle/psyq.atom.c"
|
# include "duffle/psyq.atom.c"
|
||||||
# include "gen/offsets.h"
|
# include "gen/offsets.h"
|
||||||
# include "gen/macs.h"
|
# include "gen/macs.h"
|
||||||
|
# include "gen/auto_reg.h"
|
||||||
# include "hello_camera.h"
|
# include "hello_camera.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -24,8 +25,8 @@ ATOM_FILE_DEBUGGER_LINE_MARKER(hello_joypad_atom_c);
|
|||||||
|
|
||||||
#pragma region MACs (Mips Atom components)
|
#pragma region MACs (Mips Atom components)
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_put_disp_env(U4 reg_transfer, U4 reg_base, U2 port)
|
FI_ Slice_MipsCode ac_put_disp_env(AtomBuilder_R ab, U4 reg_transfer, U4 reg_base, U2 port)
|
||||||
MipsAtomComp_Proc_(ac_put_disp_env, {
|
MipsAtomComp_Proc_(ac_put_disp_env, ab, {
|
||||||
// Emits 5 GP0 commands for buffer 0 (display_area = (0,0,320,240)).
|
// Emits 5 GP0 commands for buffer 0 (display_area = (0,0,320,240)).
|
||||||
// Sequence per libpsyx PutDispEnv: DrawArea TL → DrawArea BR → Mask → DrawArea TL → DrawArea BR
|
// Sequence per libpsyx PutDispEnv: DrawArea TL → DrawArea BR → Mask → DrawArea TL → DrawArea BR
|
||||||
mac_gcmd_push(gp0_word_draw_area_top_left_origin, reg_transfer, reg_base, port),
|
mac_gcmd_push(gp0_word_draw_area_top_left_origin, reg_transfer, reg_base, port),
|
||||||
@@ -35,8 +36,8 @@ MipsAtomComp_Proc_(ac_put_disp_env, {
|
|||||||
mac_gcmd_push(gp0_word_draw_area_bottom_right_320x240, reg_transfer, reg_base, port),
|
mac_gcmd_push(gp0_word_draw_area_bottom_right_320x240, reg_transfer, reg_base, port),
|
||||||
})
|
})
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_put_draw_env(U4 reg_transfer, U4 reg_base, U2 port)
|
FI_ Slice_MipsCode ac_put_draw_env(AtomBuilder_R ab, U4 reg_transfer, U4 reg_base, U2 port)
|
||||||
MipsAtomComp_Proc_(ac_put_draw_env, {
|
MipsAtomComp_Proc_(ac_put_draw_env, ab, {
|
||||||
/*
|
/*
|
||||||
* ORIGIN: each code word corresponds to the EXACT value libpsyx's PutDrawEnv function would compute for the same DrawEnv settings.
|
* ORIGIN: each code word corresponds to the EXACT value libpsyx's PutDrawEnv function would compute for the same DrawEnv settings.
|
||||||
* References:
|
* References:
|
||||||
@@ -90,6 +91,404 @@ MipsAtomComp_Proc_(ac_put_draw_env, {
|
|||||||
|
|
||||||
#pragma endregion MACs
|
#pragma endregion MACs
|
||||||
|
|
||||||
|
#pragma region Atom Procs
|
||||||
|
// Modular Atoms
|
||||||
|
|
||||||
|
/* Scratchpad layout for the resolve_look_at bundle.
|
||||||
|
* The chain atoms communicate entirely via the wave-context GPR carrier R_ResolveScratch (R_T4) + hardcoded offsets into smem.scratchpad
|
||||||
|
* (PS1 hardware scratchpad at 0x1F800000).
|
||||||
|
*
|
||||||
|
* Atom 0 (input_and_sub) STAGES the C-side inputs (eye, up_in) into the scratchpad;
|
||||||
|
* AT THE SAME TIME it computes fwd = target - eye and stores it at scratch+0.
|
||||||
|
* Atoms 1-6 then read/write specific scratchpad offsets internally using
|
||||||
|
* `r_scratch + hardcoded_offset` — no tape-data pointers are passed between atoms.
|
||||||
|
* +0 fwd (atom 0 writes; atom 1 reads)
|
||||||
|
* +16 uz (atom 1 writes; atoms 2 + 4 read)
|
||||||
|
* +32 right (atom 2 writes; atom 3 reads)
|
||||||
|
* +48 ux (atom 3 writes; atoms 4 + 6 read)
|
||||||
|
* +64 up (atom 4 writes; atom 5 reads)
|
||||||
|
* +80 uy (atom 5 writes; atom 6 reads)
|
||||||
|
* +96 eye (atom 0 stages from C-side pointer; atom 6 reads)
|
||||||
|
* +128 up_in (atom 0 stages from C-side pointer; atom 2 reads)
|
||||||
|
*/
|
||||||
|
|
||||||
|
// enum {
|
||||||
|
// R_LookAt = R_T0 atom_reg atom_type(MT3_S2S4*),
|
||||||
|
// R_CamEye = R_T1 atom_reg atom_type(P3_S4*),
|
||||||
|
// R_CamTarget = R_T2 atom_reg atom_type(P3_S4*),
|
||||||
|
// R_WorldUp = R_T3 atom_reg atom_type(V3_S4*),
|
||||||
|
// };
|
||||||
|
|
||||||
|
enum {
|
||||||
|
/* Wave-context GPR carrier for the resolve_look_at bundle: the scratch base.
|
||||||
|
* Set by atom 0 (popped from tape), read by atoms 1-6 (used as pointer base). */
|
||||||
|
R_ResolveScratch = R_T4 atom_reg atom_type(U4*),
|
||||||
|
};
|
||||||
|
typedef Struct_(Binds_ResolveLookAt) {
|
||||||
|
MT3_S2S4* look_at;
|
||||||
|
P3_S4* eye;
|
||||||
|
P3_S4* target;
|
||||||
|
V3_S4* up_in;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* ─── ResolveLookAtScratch — offset schema for the resolve_look_at bundle's
|
||||||
|
* scratchpad slots (PS1 hardware scratchpad at 0x1F800000).
|
||||||
|
*
|
||||||
|
* Each slot is 16 bytes: V3_S4 is already 16 bytes (4 × S4 = x/y/z/pad).
|
||||||
|
* The struct fields are contiguous — slot i starts at offset i*16.
|
||||||
|
* Used by the assembly via O_(ResolveLookAtScratch, fld.x/y/z) which resolves to a compile-time byte offset.
|
||||||
|
* NOT a runtime struct — the struct is purely a schema for offsets; the assembly uses `r_scratch + O_(...)` to compute slot addresses at runtime.
|
||||||
|
*
|
||||||
|
* Slot producers/consumers (referenced by the resolve_look_at chain atoms):
|
||||||
|
* +0 fwd 0 writes (target - eye); atom 1 (normalize) reads
|
||||||
|
* +16 uz 1 writes (normalize fwd); atoms 2 + 4 read (cross operands)
|
||||||
|
* +32 right 2 writes (cross uz x up_in); atom 3 (normalize) reads
|
||||||
|
* +48 ux 3 writes (normalize right); atoms 4 + 6 read
|
||||||
|
* +64 up 4 writes (cross uz x ux); atom 5 (normalize) reads
|
||||||
|
* +80 uy 5 writes (normalize up); atom 6 reads
|
||||||
|
* +96 eye 0 stages (C-side input); atom 6 reads (translation column)
|
||||||
|
* +112 target reserved (currently written nowhere — kept for symmetry w/ eye)
|
||||||
|
* +128 up_in 0 stages (C-side input); atom 2 reads (cross operand)
|
||||||
|
*
|
||||||
|
* Fields use P3_S4 (point) for eye/target (RGA: affine point, implicit weight 1);
|
||||||
|
* V3_S4 (vector) for fwd/uz/right/ux/up/uy/up_in (RGA: Euclidean vector).
|
||||||
|
* P3_S4 is a storage alias of V3_S4 (see math.h comment: "Storage alias of V3_S4.
|
||||||
|
* Use P3_S4 when the value is a point.") — both are 16 bytes.
|
||||||
|
*/
|
||||||
|
typedef Struct_(ResolveLookAtScratch) {
|
||||||
|
V3_S4 fwd; /* offset +0 (16 bytes — 4 S4 fields incl. internal pad) */
|
||||||
|
V3_S4 uz; /* offset +16 (16 bytes) */
|
||||||
|
V3_S4 right; /* offset +32 (16 bytes) */
|
||||||
|
V3_S4 ux; /* offset +48 (16 bytes) */
|
||||||
|
V3_S4 up; /* offset +64 (16 bytes) */
|
||||||
|
V3_S4 uy; /* offset +80 (16 bytes) */
|
||||||
|
P3_S4 eye; /* offset +96 (16 bytes; storage alias of V3_S4) */
|
||||||
|
P3_S4 target; /* offset +112 (16 bytes; storage alias of V3_S4) */
|
||||||
|
V3_S4 up_in; /* offset +128 (16 bytes) */
|
||||||
|
};
|
||||||
|
|
||||||
|
/* ─── resolve_look_at bundle chain atoms ────────────────────────────
|
||||||
|
* 4 unique atom procs in the resolve_look_at bundle (4 chain atoms + 3 calls to generic normalize_v3s4_proc).
|
||||||
|
* All 4 chain atoms are runtime-built MipsAtom_Proc_ atoms: each function declares a static MipsCode[] body,
|
||||||
|
* then calls atombuilder_unroll() to append it to the caller's MipsAtomBuilder arena. resolve_look_at_init()
|
||||||
|
* uses this pattern to pre-build the bundle into the static arena (smem.resolve_look_at_arena).
|
||||||
|
*
|
||||||
|
* Atom roster:
|
||||||
|
* 0: resolve_look_at__input_and_sub (chain atom)
|
||||||
|
* 1: normalize_v3s4_proc (gte.atom.c) (generic normalize; called for fwd→uz)
|
||||||
|
* 2: resolve_look_at__cross_uz_up_in_to_right (chain atom)
|
||||||
|
* 3: normalize_v3s4_proc (gte.atom.c) (generic normalize; called for right→ux)
|
||||||
|
* 4: resolve_look_at__cross_uz_ux_to_up (chain atom)
|
||||||
|
* 5: normalize_v3s4_proc (gte.atom.c) (generic normalize; called for up→uy)
|
||||||
|
* 6: resolve_look_at__populate_and_translate (chain atom)
|
||||||
|
*
|
||||||
|
* The generic normalize_v3s4_proc is a parameterized 4-stage GTE normalize (SQR → mfc2 → LZCS → GPF → srav);
|
||||||
|
* it accepts scratch base + offset args so any caller (with a scratch base + struct schema) can use it.
|
||||||
|
*/
|
||||||
|
|
||||||
|
typedef Struct_(Binds_ResolveLookAtSub) {
|
||||||
|
U4 target; /* U4 (C-side P3_S4* — read by atom 0 directly; NOT a scratchpad address) */
|
||||||
|
U4 eye; /* U4 (C-side P3_S4* — read by atom 0 directly; staged into scratchpad by atom 0) */
|
||||||
|
U4 up_in; /* U4 (C-side V3_S4* — read by atom 0 directly; staged into scratchpad by atom 0) */
|
||||||
|
U4 scratchpad;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Atom 0 in the bundle: input_and_sub. Stages C-side inputs into the scratchpad and computes fwd = target - eye.
|
||||||
|
* Inputs (C-side pointers popped from the tape):
|
||||||
|
* r_target_ptr : P3_S4* (C-side struct; atom 0 reads target.x/y/z directly)
|
||||||
|
* r_eye_ptr : P3_S4* (C-side struct; staged into scratchpad at +96/+100/+104)
|
||||||
|
* r_up_in_ptr : V3_S4* (C-side struct; staged into scratchpad at +128/+132/+136)
|
||||||
|
* r_scratch : R_ResolveScratch (R_T4) — scratch base, read by atoms 1-6
|
||||||
|
*
|
||||||
|
* Bind-pop layout:
|
||||||
|
* Binds_ResolveLookAtSub
|
||||||
|
* Staging work:
|
||||||
|
* * Stage eye.x/y/z → scratch (for atom 6's translation column)
|
||||||
|
* * Stage up_in.x/y/z → scratch (for atom 2's outer-product operand)
|
||||||
|
* * Compute fwd = target - eye, store fwd.x/y/z → scratch+0/+4/+8 (for atom 1)
|
||||||
|
*
|
||||||
|
* GPR codes (assigned by resolve_look_at_init):
|
||||||
|
* r_target_ptr : R_T0
|
||||||
|
* r_eye_ptr : R_T1
|
||||||
|
* r_up_in_ptr : R_T2
|
||||||
|
* r_scratch : R_T4 (R_ResolveScratch; wave-context carrier)
|
||||||
|
* r_tmp0 : R_T3 (stage eye/up_in + load eye.y)
|
||||||
|
* r_tmp1 : R_T5 (stage eye/up_in + load eye.z)
|
||||||
|
* r_tmp2 : R_T6 (stage eye/up_in + load target.x)
|
||||||
|
* r_tmp3 : R_T7 (stage eye/up_in + load target.y)
|
||||||
|
* R_AT : hardcoded (load eye.y / eye.z / target.z)
|
||||||
|
* R_V0 : hardcoded (load eye.z / target.z)
|
||||||
|
*
|
||||||
|
* Pool cost: 8 GPRs + R_T4 (carrier) + R_AT + R_V0 (hardcoded) = 11 GPRs.
|
||||||
|
*/
|
||||||
|
I_ MipsAtom* resolve_look_at__input_and_sub_proc(AtomArena_R aa, U4 r_scratch
|
||||||
|
, U4 r_target_ptr,U4 r_eye_ptr, U4 r_up_in_ptr
|
||||||
|
, U4 r_tmp0, U4 r_tmp1, U4 r_tmp2, U4 r_tmp3
|
||||||
|
) MipsAtom_Proc_(resolve_look_at__input_and_sub, aa, {
|
||||||
|
/* Pop the 3 C-side pointers + scratch_base from the tape. */
|
||||||
|
load_word(r_target_ptr, R_TapePtr, O_(Binds_ResolveLookAtSub,target)),
|
||||||
|
load_word(r_eye_ptr, R_TapePtr, O_(Binds_ResolveLookAtSub,eye)),
|
||||||
|
load_word(r_up_in_ptr, R_TapePtr, O_(Binds_ResolveLookAtSub,up_in)),
|
||||||
|
load_word(r_scratch, R_TapePtr, O_(Binds_ResolveLookAtSub,scratchpad)),
|
||||||
|
add_ui_self( R_TapePtr, S_(Binds_ResolveLookAtSub)),
|
||||||
|
|
||||||
|
/* Stage eye.x/y/z into the scratchpad (atom 6 reads these for the translation
|
||||||
|
* column). Reuse r_tmp0/r_tmp1/r_tmp2. Offsets via O_(ResolveLookAtScratch,*). */
|
||||||
|
load_word(r_tmp0, r_eye_ptr, O_(P3_S4,x)),
|
||||||
|
load_word(r_tmp1, r_eye_ptr, O_(P3_S4,y)),
|
||||||
|
load_word(r_tmp2, r_eye_ptr, O_(P3_S4,z)),
|
||||||
|
nop, /* load-delay */
|
||||||
|
store_word(r_tmp0, r_scratch, O_(ResolveLookAtScratch,eye.x)),
|
||||||
|
store_word(r_tmp1, r_scratch, O_(ResolveLookAtScratch,eye.y)),
|
||||||
|
store_word(r_tmp2, r_scratch, O_(ResolveLookAtScratch,eye.z)),
|
||||||
|
|
||||||
|
/* Stage up_in.x/y/z into the scratchpad (atom 2 reads these for the outer
|
||||||
|
* product with uz). Reuse r_tmp0/r_tmp1/r_tmp2. */
|
||||||
|
load_word(r_tmp0, r_up_in_ptr, O_(V3_S4,x)),
|
||||||
|
load_word(r_tmp1, r_up_in_ptr, O_(V3_S4,y)),
|
||||||
|
load_word(r_tmp2, r_up_in_ptr, O_(V3_S4,z)),
|
||||||
|
nop, /* load-delay */
|
||||||
|
store_word(r_tmp0, r_scratch, O_(ResolveLookAtScratch,up_in.x)),
|
||||||
|
store_word(r_tmp1, r_scratch, O_(ResolveLookAtScratch,up_in.y)),
|
||||||
|
store_word(r_tmp2, r_scratch, O_(ResolveLookAtScratch,up_in.z)),
|
||||||
|
|
||||||
|
/* Compute fwd = target - eye. */
|
||||||
|
load_word(r_tmp0, r_target_ptr, O_(P3_S4,x)),
|
||||||
|
load_word(r_tmp1, r_target_ptr, O_(P3_S4,y)),
|
||||||
|
load_word(r_tmp2, r_target_ptr, O_(P3_S4,z)),
|
||||||
|
load_word(r_tmp3, r_eye_ptr, O_(P3_S4,x)),
|
||||||
|
load_word(R_AT, r_eye_ptr, O_(P3_S4,y)),
|
||||||
|
load_word(R_V0, r_eye_ptr, O_(P3_S4,z)),
|
||||||
|
nop, /* load-delay */
|
||||||
|
sub_u(r_tmp0, r_tmp0, r_tmp3),
|
||||||
|
sub_u(r_tmp1, r_tmp1, R_AT),
|
||||||
|
sub_u(r_tmp2, r_tmp2, R_V0),
|
||||||
|
|
||||||
|
/* Store fwd.x/y/z (atom 1 reads these as the normalize src). */
|
||||||
|
store_word(r_tmp0, r_scratch, O_(ResolveLookAtScratch,fwd.x)),
|
||||||
|
store_word(r_tmp1, r_scratch, O_(ResolveLookAtScratch,fwd.y)),
|
||||||
|
store_word(r_tmp2, r_scratch, O_(ResolveLookAtScratch,fwd.z)),
|
||||||
|
|
||||||
|
mac_yield()
|
||||||
|
})
|
||||||
|
|
||||||
|
/* Atoms 2 + 4 in the bundle: out = a × b (GTE outer product on IR/D vectors).
|
||||||
|
* No bind pop — the three operand pointers (a, b, out) are derived in-body from r_scratch + hardcoded_offset.
|
||||||
|
* Each atom has its own variant because the offsets are baked into the body and each atom uses unique GPRs.
|
||||||
|
*
|
||||||
|
* GTE register layout (per PSX-SPX + duffle gte.h):
|
||||||
|
* IR1/2/3 = a.x/y/z (mtc2)
|
||||||
|
* VXY0 = b.x (mtc2)
|
||||||
|
* VZ0 = b.y (mtc2)
|
||||||
|
* VXY1 = b.z (mtc2)
|
||||||
|
* OP = outer product
|
||||||
|
* MAC1/2/3 = out.x/y/z (mfc2)
|
||||||
|
*
|
||||||
|
* Pool cost: r_scratch (R_T4 carrier) + 7 body GPRs + R_AT + R_V0 (hardcoded) = 10 GPRs.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Atom 2: cross uz × up_in → right. */
|
||||||
|
I_ MipsAtom* resolve_look_at__cross_uz_up_in_to_right_proc(AtomArena_R aa, U4 r_scratch
|
||||||
|
, U4 r_a, U4 r_b, U4 r_c /* load a.x/y/z; result out.x/y/z */
|
||||||
|
, U4 r_d /* load b.x */
|
||||||
|
, U4 r_f, U4 r_g, U4 r_h /* r_f = &right (out ptr), r_g = &uz, r_h = &up_in */
|
||||||
|
) MipsAtom_Proc_(resolve_look_at__cross_uz_up_in_to_right, aa, {
|
||||||
|
/* Compute the three scratch pointers from r_scratch. */
|
||||||
|
add_si(r_g, r_scratch, O_(ResolveLookAtScratch,uz)), /* r_g = &uz */
|
||||||
|
add_si(r_h, r_scratch, O_(ResolveLookAtScratch,up_in)), /* r_h = &up_in */
|
||||||
|
add_si(r_f, r_scratch, O_(ResolveLookAtScratch,right)), /* r_f = &right (out) */
|
||||||
|
nop,
|
||||||
|
|
||||||
|
/* Load a (uz).x/y/z into r_a/r_b/r_c. */
|
||||||
|
load_word(r_a, r_g, O_(V3_S4,x)),
|
||||||
|
load_word(r_b, r_g, O_(V3_S4,y)),
|
||||||
|
load_word(r_c, r_g, O_(V3_S4,z)),
|
||||||
|
nop,
|
||||||
|
|
||||||
|
/* Load b (up_in).x/y/z into r_d + R_AT/R_V0
|
||||||
|
(hardcoded; reusing the body's last two loads is fine because the load-delay slot is the nop after the third load,
|
||||||
|
and mtc2 below doesn't read these regs). */
|
||||||
|
load_word(r_d, r_h, O_(V3_S4,x)),
|
||||||
|
load_word(R_AT, r_h, O_(V3_S4,y)),
|
||||||
|
load_word(R_V0, r_h, O_(V3_S4,z)),
|
||||||
|
nop,
|
||||||
|
|
||||||
|
/* mtc2 a → IR1/2/3, b → D1/2/3 (VXY0/VZ0/VXY1). */
|
||||||
|
gte_mv_to_data_r(r_a, C2_IR1),
|
||||||
|
gte_mv_to_data_r(r_b, C2_IR2),
|
||||||
|
gte_mv_to_data_r(r_c, C2_IR3),
|
||||||
|
gte_mv_to_data_r(r_d, C2_VXY0), /* D1 = b.x */
|
||||||
|
gte_mv_to_data_r(R_AT, C2_VZ0), /* D2 = b.y */
|
||||||
|
gte_mv_to_data_r(R_V0, C2_VXY1), /* D3 = b.z */
|
||||||
|
nop2, /* MTC2 retirement (CPU→COP2 2-slot delay) */
|
||||||
|
|
||||||
|
gte_cmdw_outer_product, /* OP fires; MAC1/2/3 = a × b */
|
||||||
|
|
||||||
|
/* mfc2 MAC1/2/3 → r_a/r_b/r_c (out.x/y/z). */
|
||||||
|
gte_mv_from_data_r(r_a, C2_MAC1),
|
||||||
|
gte_mv_from_data_r(r_b, C2_MAC2),
|
||||||
|
gte_mv_from_data_r(r_c, C2_MAC3),
|
||||||
|
nop, /* MFC2 retirement */
|
||||||
|
|
||||||
|
/* Store out.x/y/z to r_f (out ptr = scratch+32). */
|
||||||
|
store_word(r_a, r_f, O_(V3_S4,x)),
|
||||||
|
store_word(r_b, r_f, O_(V3_S4,y)),
|
||||||
|
store_word(r_c, r_f, O_(V3_S4,z)),
|
||||||
|
|
||||||
|
mac_yield()
|
||||||
|
})
|
||||||
|
|
||||||
|
/* Atom 4: cross uz × ux → up. */
|
||||||
|
I_ MipsAtom* resolve_look_at__cross_uz_ux_to_up_proc(AtomArena_R aa, U4 r_scratch
|
||||||
|
, U4 r_a, U4 r_b, U4 r_c /* load a.x/y/z; result out.x/y/z */
|
||||||
|
, U4 r_d /* load b.x */
|
||||||
|
, U4 r_f, U4 r_g, U4 r_h /* r_f = &up (out ptr), r_g = &uz, r_h = &ux */
|
||||||
|
) MipsAtom_Proc_(resolve_look_at__cross_uz_ux_to_up, aa, {
|
||||||
|
/* Compute the three scratch pointers from r_scratch. */
|
||||||
|
add_si(r_g, r_scratch, O_(ResolveLookAtScratch,uz)), /* r_g = &uz */
|
||||||
|
add_si(r_h, r_scratch, O_(ResolveLookAtScratch,ux)), /* r_h = &ux */
|
||||||
|
add_si(r_f, r_scratch, O_(ResolveLookAtScratch,up)), /* r_f = &up (out) */
|
||||||
|
nop,
|
||||||
|
|
||||||
|
/* Load a (uz).x/y/z into r_a/r_b/r_c. */
|
||||||
|
load_word(r_a, r_g, O_(V3_S4,x)),
|
||||||
|
load_word(r_b, r_g, O_(V3_S4,y)),
|
||||||
|
load_word(r_c, r_g, O_(V3_S4,z)),
|
||||||
|
nop,
|
||||||
|
|
||||||
|
/* Load b (ux).x/y/z into r_d + R_AT/R_V0. */
|
||||||
|
load_word(r_d, r_h, O_(V3_S4,x)),
|
||||||
|
load_word(R_AT, r_h, O_(V3_S4,y)),
|
||||||
|
load_word(R_V0, r_h, O_(V3_S4,z)),
|
||||||
|
nop,
|
||||||
|
|
||||||
|
/* mtc2 a → IR1/2/3, b → D1/2/3 (VXY0/VZ0/VXY1). */
|
||||||
|
gte_mv_to_data_r(r_a, C2_IR1),
|
||||||
|
gte_mv_to_data_r(r_b, C2_IR2),
|
||||||
|
gte_mv_to_data_r(r_c, C2_IR3),
|
||||||
|
gte_mv_to_data_r(r_d, C2_VXY0),
|
||||||
|
gte_mv_to_data_r(R_AT, C2_VZ0),
|
||||||
|
gte_mv_to_data_r(R_V0, C2_VXY1),
|
||||||
|
nop2,
|
||||||
|
|
||||||
|
gte_cmdw_outer_product,
|
||||||
|
gte_mv_from_data_r(r_a, C2_MAC1),
|
||||||
|
gte_mv_from_data_r(r_b, C2_MAC2),
|
||||||
|
gte_mv_from_data_r(r_c, C2_MAC3),
|
||||||
|
nop,
|
||||||
|
store_word(r_a, r_f, O_(V3_S4,x)),
|
||||||
|
store_word(r_b, r_f, O_(V3_S4,y)),
|
||||||
|
store_word(r_c, r_f, O_(V3_S4,z)),
|
||||||
|
|
||||||
|
mac_yield()
|
||||||
|
})
|
||||||
|
|
||||||
|
typedef Struct_(Binds_ResolveLookAtPopAndTrans) {
|
||||||
|
U4 look_at; /* U4 (MT3_S2S4* — destination matrix address) */
|
||||||
|
};
|
||||||
|
/* Atom 6 in the bundle: write look_at->m[][] from ux/uy/uz, then compute the translation column t[] = R * (-eye).
|
||||||
|
*
|
||||||
|
* GPR codes (assigned by resolve_look_at_init):
|
||||||
|
* r_look_at : MT3_S2S4* (popped from tape; output matrix destination)
|
||||||
|
* r_pux : pointer to ux (offset O_(ResolveLookAtScratch,ux))
|
||||||
|
* r_puy : pointer to uy (offset O_(ResolveLookAtScratch,uy))
|
||||||
|
* r_puz : pointer to uz (offset O_(ResolveLookAtScratch,uz))
|
||||||
|
* r_peye : pointer to eye (offset O_(ResolveLookAtScratch,eye))
|
||||||
|
* r_tmp0/1/2 : atom-local scratch (load + MVMVA + store temps)
|
||||||
|
*
|
||||||
|
* 4 pointer regs (r_pux/r_puy/r_puz/r_peye) are DEDICATED — they hold the scratch addresses for the entire body.
|
||||||
|
* They are computed in-body via `add_si(r_px, r_scratch, O_(ResolveLookAtScratch, field))` so no tape-data pointer is needed.
|
||||||
|
*
|
||||||
|
* Struct layout (per duffle/math.h):
|
||||||
|
* MT3_S2S4 { A3x3_S2 m; A3_S4 t; } → m[][] is S2 packed (9 × 2 = 18 bytes at offset 0)
|
||||||
|
* t[0/1/2] is S4 (3 × 4 = 12 bytes at offset 18)
|
||||||
|
*
|
||||||
|
* Translation column: GTE MVMVA with the world rotation matrix pre-set
|
||||||
|
* (helper emits set_gte_world before the bundle, per the bundle design).
|
||||||
|
* MVMVA computes R * pos (with cv=0/mx=0/sf=0/v=0); MAC1/2/3 = R * (-eye).
|
||||||
|
* Pool cost: r_look_at (1) + r_scratch (R_T4 carrier) + 4 ptr regs + 3 tmp regs = 9 GPRs.
|
||||||
|
*/
|
||||||
|
I_ MipsAtom* resolve_look_at__populate_and_translate_proc(AtomArena_R aa
|
||||||
|
, U4 r_look_at
|
||||||
|
, U4 r_scratch
|
||||||
|
, U4 r_pux, U4 r_puy, U4 r_puz, U4 r_peye /* 4 dedicated pointer regs */
|
||||||
|
, U4 r_tmp0, U4 r_tmp1, U4 r_tmp2 /* 3 atom-local scratch regs */
|
||||||
|
) MipsAtom_Proc_(resolve_look_at__populate_and_translate, aa, {
|
||||||
|
/* Pop look_at* (the matrix output) — advance R_TapePtr by 4 bytes. */
|
||||||
|
load_word(r_look_at, R_TapePtr, O_(Binds_ResolveLookAtPopAndTrans,look_at)),
|
||||||
|
add_ui_self( R_TapePtr, S_(Binds_ResolveLookAtPopAndTrans)),
|
||||||
|
|
||||||
|
/* Compute the 4 scratch pointers in their dedicated GPRs. */
|
||||||
|
add_si(r_pux, r_scratch, O_(ResolveLookAtScratch,ux)), /* r_pux = &ux */
|
||||||
|
add_si(r_puy, r_scratch, O_(ResolveLookAtScratch,uy)), /* r_puy = &uy */
|
||||||
|
add_si(r_puz, r_scratch, O_(ResolveLookAtScratch,uz)), /* r_puz = &uz */
|
||||||
|
add_si(r_peye, r_scratch, O_(ResolveLookAtScratch,eye)), /* r_peye = &eye */
|
||||||
|
nop,
|
||||||
|
|
||||||
|
/* ── m[0] = (S2)ux ── */
|
||||||
|
load_word(r_tmp0, r_pux, O_(V3_S4,x)),
|
||||||
|
load_word(r_tmp1, r_pux, O_(V3_S4,y)),
|
||||||
|
load_word(r_tmp2, r_pux, O_(V3_S4,z)),
|
||||||
|
nop,
|
||||||
|
store_half(r_tmp0, r_look_at, O_(MT3_S2S4,m[0][0])),
|
||||||
|
store_half(r_tmp1, r_look_at, O_(MT3_S2S4,m[0][1])),
|
||||||
|
store_half(r_tmp2, r_look_at, O_(MT3_S2S4,m[0][2])),
|
||||||
|
|
||||||
|
/* ── m[1] = (S2)uy ── */
|
||||||
|
load_word(r_tmp0, r_puy, O_(V3_S4,x)),
|
||||||
|
load_word(r_tmp1, r_puy, O_(V3_S4,y)),
|
||||||
|
load_word(r_tmp2, r_puy, O_(V3_S4,z)),
|
||||||
|
nop,
|
||||||
|
store_half(r_tmp0, r_look_at, O_(MT3_S2S4,m[1][0])),
|
||||||
|
store_half(r_tmp1, r_look_at, O_(MT3_S2S4,m[1][1])),
|
||||||
|
store_half(r_tmp2, r_look_at, O_(MT3_S2S4,m[1][2])),
|
||||||
|
|
||||||
|
/* ── m[2] = (S2)uz ── */
|
||||||
|
load_word(r_tmp0, r_puz, O_(V3_S4,x)),
|
||||||
|
load_word(r_tmp1, r_puz, O_(V3_S4,y)),
|
||||||
|
load_word(r_tmp2, r_puz, O_(V3_S4,z)),
|
||||||
|
nop,
|
||||||
|
store_half(r_tmp0, r_look_at, O_(MT3_S2S4,m[2][0])),
|
||||||
|
store_half(r_tmp1, r_look_at, O_(MT3_S2S4,m[2][1])),
|
||||||
|
store_half(r_tmp2, r_look_at, O_(MT3_S2S4,m[2][2])),
|
||||||
|
|
||||||
|
/* ── Translation column t[i] = R * (-eye) ─────────────────────────────
|
||||||
|
* pos = -eye: load eye.x/y/z from r_peye, negate via sub_u from R_0. */
|
||||||
|
load_word(r_tmp0, r_peye, O_(P3_S4,x)),
|
||||||
|
load_word(r_tmp1, r_peye, O_(P3_S4,y)),
|
||||||
|
load_word(r_tmp2, r_peye, O_(P3_S4,z)),
|
||||||
|
nop,
|
||||||
|
sub_u(r_tmp0, R_0, r_tmp0), /* pos.x = -eye.x */
|
||||||
|
sub_u(r_tmp1, R_0, r_tmp1),
|
||||||
|
sub_u(r_tmp2, R_0, r_tmp2),
|
||||||
|
|
||||||
|
/* mtc2 IR1/2/3 = pos (for MVMVA — input vector registers). */
|
||||||
|
gte_mv_to_data_r(r_tmp0, C2_IR1),
|
||||||
|
gte_mv_to_data_r(r_tmp1, C2_IR2),
|
||||||
|
gte_mv_to_data_r(r_tmp2, C2_IR3),
|
||||||
|
nop2,
|
||||||
|
|
||||||
|
/* MVMVA: MAC1/2/3 = R * IR with cv=0 (no TR vector), mx=0 (rotation matrix), sf=0 (no shift), v=0 (V0 = IR1/2/3, no far-plane clipping).
|
||||||
|
* The pre-set rotation matrix is the one set by the preceding set_gte_world atom.
|
||||||
|
* gte_cmdw_mvmva is parameterless and defaults to cv=0/mx=0/sf=0/v=0. */
|
||||||
|
gte_cmdw_mvmva,
|
||||||
|
nop, /* GTE interlock */
|
||||||
|
|
||||||
|
/* mfc2 MAC1/2/3 → r_tmp0/r_tmp1/r_tmp2 (sign-extended into 32-bit GPRs).
|
||||||
|
* MAC1/2/3 hold R*v with no TR add and no perspective divide — exactly the 3 distinct world-space translation values we need for t[0..2]. */
|
||||||
|
gte_mv_from_data_r(r_tmp0, C2_MAC1),
|
||||||
|
gte_mv_from_data_r(r_tmp1, C2_MAC2),
|
||||||
|
gte_mv_from_data_r(r_tmp2, C2_MAC3),
|
||||||
|
nop,
|
||||||
|
store_word(r_tmp0, r_look_at, O_(MT3_S2S4,t[0])),
|
||||||
|
store_word(r_tmp1, r_look_at, O_(MT3_S2S4,t[1])),
|
||||||
|
store_word(r_tmp2, r_look_at, O_(MT3_S2S4,t[2])),
|
||||||
|
|
||||||
|
mac_yield()
|
||||||
|
})
|
||||||
|
|
||||||
|
#pragma endregion Atom Procs
|
||||||
|
|
||||||
#pragma region Baked Atoms
|
#pragma region Baked Atoms
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
@@ -151,32 +550,52 @@ internal MipsAtom_(screen_env_init) atom_info(atom_phase(screen_init)
|
|||||||
mac_yield(),
|
mac_yield(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* gp_screen_init's GPR setup. Tests the mixed user-pinning + auto-reg pattern:
|
||||||
|
* - R_IO_BaseAddr = R_T4 (user-pinned via atom_reg; pre-existing)
|
||||||
|
* - R_GP1_Offset = R_T2 (user-pinned via atom_reg; NEW -- for GPIO_PORT1_OFFSET)
|
||||||
|
* - R_ScreenX = R_T5 (user-pinned via atom_reg; used as a transfer and GTE setup reg)
|
||||||
|
* - R_GpTmp = auto-allocated by the lua pass and used for several GPU transfers;
|
||||||
|
* the C preprocessor resolves it to the chosen free pool GPR.
|
||||||
|
*
|
||||||
|
* For gp_screen_init, the auto-reg pool exclusions are:
|
||||||
|
* user_pinned (from the corpus register_alias_registry) : R_T0..R_T7 (all 8 user-pinned across hello_camera.atom.c)
|
||||||
|
* body-parsed physical registers : aliases resolve through the registry;
|
||||||
|
* the body uses R_ScreenX, not raw R_T5
|
||||||
|
* source_pool after both subtractions : {R_V0, R_V1} only
|
||||||
|
* R_GpTmp gets R_V0 (the first-fit choice). Its repeated GPU-transfer use proves that the
|
||||||
|
* auto-reg allocation is active while the R_ScreenX references prove the pinned alias is used.
|
||||||
|
* R_TapePtr (R_T9), R_AtomJmp (R_T8), R_AT are excluded from the POOL by construction in
|
||||||
|
* passes/auto_reg.lua -- see the "obvious exclusions" comment block at the top of that file.
|
||||||
|
*/
|
||||||
enum {
|
enum {
|
||||||
R_IO_BaseAddr = R_T4 atom_reg, /* Caller-pinned: IO_BASE_ADDR = 0x1F800000 */
|
R_IO_BaseAddr = R_T4 atom_reg, /* Caller-pinned: IO_BASE_ADDR = 0x1F800000 */
|
||||||
|
R_GP1_Offset = R_T2 atom_reg, /* Caller-pinned: GPIO_PORT1_OFFSET = 0x10 */
|
||||||
|
atom_auto_reg(gp_screen_init, R_GpTmp), /* Auto-allocated scratch; resolved to a free pool GPR by the lua pass. C-preprocessor expands to R_GpTmp = R_GpTmp_Code with an atom_auto_reg trailing comment. */
|
||||||
#define R_IO_BaseAddr_Code R_T4_Code
|
#define R_IO_BaseAddr_Code R_T4_Code
|
||||||
|
#define R_GP1_Offset_Code R_T2_Code
|
||||||
};
|
};
|
||||||
internal MipsAtom_(gp_screen_init) atom_info(atom_phase(screen_init), atom_reads(R_IO_BaseAddr)) {
|
internal MipsAtom_(gp_screen_init) atom_info(atom_phase(screen_init), atom_reads(R_IO_BaseAddr)) {
|
||||||
store_word(R_0, R_IO_BaseAddr, GPIO_PORT1_OFFSET), /* GP1(00h) Reset */
|
store_word(R_0, R_IO_BaseAddr, GPIO_PORT1_OFFSET), /* GP1(00h) Reset */
|
||||||
mac_gcmd_push(gp1_word_ResetCmdBuffer(), R_T5, R_IO_BaseAddr, GPIO_PORT1_OFFSET), /* GP1(01h) ClearFIFO */
|
mac_gcmd_push(gp1_word_ResetCmdBuffer(), R_ScreenX, R_IO_BaseAddr, GPIO_PORT1_OFFSET), /* GP1(01h) ClearFIFO; uses pinned R_ScreenX as the transfer reg. */
|
||||||
mac_gcmd_push(gp1_word_AcknowledgeIRQ(), R_T5, R_IO_BaseAddr, GPIO_PORT1_OFFSET), /* GP1(02h) AckIRQ */
|
mac_gcmd_push(gp1_word_AcknowledgeIRQ(), R_ScreenX, R_IO_BaseAddr, GPIO_PORT1_OFFSET), /* GP1(02h) AckIRQ; uses pinned R_ScreenX as the transfer reg. */
|
||||||
mac_gcmd_push(gp1_word_DisplayOn(), R_T5, R_IO_BaseAddr, GPIO_PORT1_OFFSET), /* GP1(03h) Display ON */
|
mac_gcmd_push(gp1_word_DisplayOn(), R_ScreenX, R_IO_BaseAddr, GPIO_PORT1_OFFSET), /* GP1(03h) Display ON; uses pinned R_ScreenX as the transfer reg. */
|
||||||
mac_gcmd_push(gp1_word_dma_to_gpu(), R_T5, R_IO_BaseAddr, GPIO_PORT1_OFFSET), /* GP1(04h) DMADirection=2 (CPU→GPU). libpsyx's per-frame PutDrawEnv/DrawOTag use DMA2; without this the DMA queue never drains. */
|
mac_gcmd_push(gp1_word_dma_to_gpu(), R_GpTmp, R_IO_BaseAddr, GPIO_PORT1_OFFSET), /* GP1(04h) DMADirection=2 (CPU->GPU). libpsyx's per-frame PutDrawEnv/DrawOTag use DMA2; without this the DMA queue never drains. Uses auto-allocated R_GpTmp. */
|
||||||
mac_gcmd_push(gp1_word_StartDisplayArea(), R_T5, R_IO_BaseAddr, GPIO_PORT1_OFFSET), /* GP1(05h) StartDisplayArea (X=0, Y=0) */
|
mac_gcmd_push(gp1_word_StartDisplayArea(), R_GpTmp, R_IO_BaseAddr, GPIO_PORT1_OFFSET), /* GP1(05h) StartDisplayArea (X=0, Y=0); uses auto-allocated R_GpTmp. */
|
||||||
|
|
||||||
/* GP1: DisplayMode + Display Ranges */
|
/* GP1: DisplayMode + Display Ranges. */
|
||||||
mac_gcmd_push(gp1_word_display_mode_320x240_15bit_ntsc, R_T5, R_IO_BaseAddr, GPIO_PORT1_OFFSET),
|
mac_gcmd_push(gp1_word_display_mode_320x240_15bit_ntsc, R_ScreenX, R_IO_BaseAddr, GPIO_PORT1_OFFSET),
|
||||||
mac_gcmd_push(gp1_word_horizontal_range_ntsc, R_T5, R_IO_BaseAddr, GPIO_PORT1_OFFSET),
|
mac_gcmd_push(gp1_word_horizontal_range_ntsc, R_ScreenX, R_IO_BaseAddr, GPIO_PORT1_OFFSET),
|
||||||
mac_gcmd_push(gp1_word_vertical_range_ntsc, R_T5, R_IO_BaseAddr, GPIO_PORT1_OFFSET),
|
mac_gcmd_push(gp1_word_vertical_range_ntsc, R_ScreenX, R_IO_BaseAddr, GPIO_PORT1_OFFSET),
|
||||||
|
|
||||||
/* GTE: SetGeomOffset (OFX, OFY) — ScreenRes_CenterX, ScreenRes_CenterY. */
|
/* GTE: SetGeomOffset (OFX, OFY) — ScreenRes_CenterX, ScreenRes_CenterY. */
|
||||||
load_upper_i(R_T5, ScreenRes_CenterX), gte_mv_to_ctrl_r(R_T5, gte_cr_OFX_Code),
|
load_upper_i(R_ScreenX, ScreenRes_CenterX), gte_mv_to_ctrl_r(R_ScreenX, gte_cr_OFX_Code),
|
||||||
load_upper_i(R_T5, ScreenRes_CenterY), gte_mv_to_ctrl_r(R_T5, gte_cr_OFY_Code),
|
load_upper_i(R_ScreenX, ScreenRes_CenterY), gte_mv_to_ctrl_r(R_ScreenX, gte_cr_OFY_Code),
|
||||||
|
|
||||||
/* GTE: SetGeomScreen (H) — CR26 (per PSX-SPX / libpsyx), value is the raw projection-plane distance, NOT shifted. */
|
/* GTE: SetGeomScreen (H) — CR26 (per PSX-SPX / libpsyx), value is the raw projection-plane distance, NOT shifted. */
|
||||||
add_ui(R_T5, R_0, ScreenZ), gte_mv_to_ctrl_r(R_T5, gte_cr_H_Code),
|
add_ui(R_ScreenX, R_0, ScreenZ), gte_mv_to_ctrl_r(R_ScreenX, gte_cr_H_Code),
|
||||||
|
|
||||||
/* GP1: DisplayEnable — bit 0 = 0 (Display ON). */
|
/* GP1: DisplayEnable — bit 0 = 0 (Display ON). */
|
||||||
mac_gcmd_push(gp1_word_DisplayOn(), R_T5, R_IO_BaseAddr, GPIO_PORT1_OFFSET),
|
mac_gcmd_push(gp1_word_DisplayOn(), R_GpTmp, R_IO_BaseAddr, GPIO_PORT1_OFFSET), /* Uses auto-allocated R_GpTmp. */
|
||||||
mac_yield(),
|
mac_yield(),
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -346,57 +765,7 @@ atom_label(exit_circle_z)
|
|||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
R_LookAt = R_T0 atom_reg atom_type(MT3_S2S4*),
|
R_PrimCursor = R_T7 atom_reg atom_type(U4*), /* Output cursor (primitive buffer) */
|
||||||
R_CamEye = R_T1 atom_reg atom_type(P3_S4*),
|
|
||||||
R_CamTarget = R_T2 atom_reg atom_type(P3_S4*),
|
|
||||||
R_WorldUp = R_T3 atom_reg atom_type(V3_S4*),
|
|
||||||
|
|
||||||
R_LkAt_Fwdx = R_T4 atom_reg atom_type(V3_S4*),
|
|
||||||
R_LkAt_Fwdy = R_T5 atom_reg atom_type(V3_S4*),
|
|
||||||
R_LkAt_Fwdz = R_T6 atom_reg atom_type(V3_S4*),
|
|
||||||
R_Eye_x = R_T7 atom_reg atom_type(V3_S4*),
|
|
||||||
R_Eye_y = R_T8 atom_reg atom_type(V3_S4*),
|
|
||||||
R_Eye_z = R_V0 atom_reg atom_type(V3_S4*),
|
|
||||||
|
|
||||||
R_LkAt_Up = R_T5 atom_reg atom_type(V3_S4*),
|
|
||||||
R_LkAt_Right = R_T6 atom_reg atom_type(V3_S4*),
|
|
||||||
|
|
||||||
R_AxisX = R_T7 atom_reg atom_type(V3_S4*),
|
|
||||||
R_AxisY = R_T8 atom_reg atom_type(V3_S4*),
|
|
||||||
R_AxisZ = R_T7 atom_reg atom_type(V3_S4*),
|
|
||||||
};
|
|
||||||
typedef Struct_(Binds_ResolveLookAt) {
|
|
||||||
MT3_S2S4* look_at;
|
|
||||||
P3_S4* eye;
|
|
||||||
P3_S4* target;
|
|
||||||
V3_S4* up_in;
|
|
||||||
};
|
|
||||||
internal MipsAtom_(resolve_look_at) atom_info(atom_bind(Binds_ResolveLookAt)) {
|
|
||||||
load_word(R_LookAt, R_TapePtr, O_(Binds_ResolveLookAt,look_at)),
|
|
||||||
load_word(R_CamEye, R_TapePtr, O_(Binds_ResolveLookAt,eye)),
|
|
||||||
load_word(R_CamTarget, R_TapePtr, O_(Binds_ResolveLookAt,target)),
|
|
||||||
load_word(R_WorldUp, R_TapePtr, O_(Binds_ResolveLookAt,up_in)),
|
|
||||||
add_ui_self( R_TapePtr, S_(Binds_ResolveLookAt)),
|
|
||||||
|
|
||||||
// load look_at and eye, then subtract (get direction), then normalize to unit vector.
|
|
||||||
mac_load_v3s4(R_LkAt_Fwdx, R_LkAt_Fwdy, R_LkAt_Fwdz, R_LookAt, 0),
|
|
||||||
mac_load_v3s4(R_Eye_x, R_Eye_y, R_Eye_z, R_CamEye, 0),
|
|
||||||
mac_sub_v3s4( R_LkAt_Fwdx, R_LkAt_Fwdy, R_LkAt_Fwdz,
|
|
||||||
R_Eye_x, R_Eye_y, R_Eye_z),
|
|
||||||
|
|
||||||
// ac_normalize_v3s4(9 args): in-place normalize direction → unit vector.
|
|
||||||
// Reg-aliasing across the 4 stages: R_T7 = r_sq_y → r_lzcr, R_T8 = r_sq_z → r_shift,
|
|
||||||
// R_V0 = r_recip_est (always), R_V1 = r_tmp. r_sx/r_sy/r_sz = R_LkAt_Fwdx/y/z (in-place).
|
|
||||||
// mac_normalize_v3s4(R_LkAt_Fwdx, R_LkAt_Fwdy, R_LkAt_Fwdz,
|
|
||||||
// R_T7, R_T8,
|
|
||||||
// R_V0,
|
|
||||||
// R_T7, R_T8, R_V1),
|
|
||||||
|
|
||||||
mac_yield(),
|
|
||||||
};
|
|
||||||
|
|
||||||
enum {
|
|
||||||
R_PrimCursor = R_T7 atom_reg atom_type(U4*), /* VRAM output cursor (primitive buffer) */
|
|
||||||
R_FaceCursor = R_T4 atom_reg atom_type(V4_S2*), /* Cube face-index cursor (V4_S2*); floor context switches to V3_S2* via atom_phase */
|
R_FaceCursor = R_T4 atom_reg atom_type(V4_S2*), /* Cube face-index cursor (V4_S2*); floor context switches to V3_S2* via atom_phase */
|
||||||
R_VertBase = R_T5 atom_reg atom_type(V3_S2*), /* Base address of the vertex array */
|
R_VertBase = R_T5 atom_reg atom_type(V3_S2*), /* Base address of the vertex array */
|
||||||
R_OtBase = R_T6 atom_reg atom_type(U4*), /* Base address of the Ordering Table */
|
R_OtBase = R_T6 atom_reg atom_type(U4*), /* Base address of the Ordering Table */
|
||||||
@@ -405,7 +774,6 @@ enum {
|
|||||||
#define R_VertBase_Code R_T5_Code
|
#define R_VertBase_Code R_T5_Code
|
||||||
#define R_OtBase_Code R_T6_Code
|
#define R_OtBase_Code R_T6_Code
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef Struct_(Binds_CubeTri) {
|
typedef Struct_(Binds_CubeTri) {
|
||||||
U4 PrimCursor;
|
U4 PrimCursor;
|
||||||
V4_S2* FaceCursor;
|
V4_S2* FaceCursor;
|
||||||
@@ -442,7 +810,7 @@ MipsAtom_(cube_g4_face) atom_info(atom_phase(cube_g4),
|
|||||||
|
|
||||||
gte_mv_from_data_r(R_T0, C2_MAC0), nop,
|
gte_mv_from_data_r(R_T0, C2_MAC0), nop,
|
||||||
branch_le_zero(R_T0, atom_offset(cull, cube_g4_face_exit)),
|
branch_le_zero(R_T0, atom_offset(cull, cube_g4_face_exit)),
|
||||||
/* BD-slot: write the prim tag (R_0=0; overwrites the legacy tag word in the prim_buffer).
|
/* BD-slot: Write the prim tag (R_0=0; overwrites the legacy tag word in the prim_buffer).
|
||||||
* If branch IS taken (face culled), the body is skipped and this 0-tag is stranded —
|
* If branch IS taken (face culled), the body is skipped and this 0-tag is stranded —
|
||||||
* harmless because the OT entry that points to this prim is created later. */
|
* harmless because the OT entry that points to this prim is created later. */
|
||||||
store_word(R_0, R_PrimCursor, O_(Poly_G4, tag)),
|
store_word(R_0, R_PrimCursor, O_(Poly_G4, tag)),
|
||||||
@@ -501,7 +869,7 @@ MipsAtom_(floor_f3_face) atom_info(atom_phase(floor_f3)
|
|||||||
, atom_reads( R_PrimCursor, R_FaceCursor, R_VertBase, R_OtBase)
|
, atom_reads( R_PrimCursor, R_FaceCursor, R_VertBase, R_OtBase)
|
||||||
, atom_writes(R_PrimCursor, R_FaceCursor)
|
, atom_writes(R_PrimCursor, R_FaceCursor)
|
||||||
) {
|
) {
|
||||||
mac_load_tri_indices( R_FaceCursor, R_T0, R_T1, R_T2),
|
mac_load_tri_indices(R_FaceCursor, R_T0, R_T1, R_T2),
|
||||||
mac_gte_load_tri_verts(R_VertBase, R_T0, R_T1, R_T2),
|
mac_gte_load_tri_verts(R_VertBase, R_T0, R_T1, R_T2),
|
||||||
nop2, gte_cmdw_rotate_translate_perspective_triple, // 2 nops retire the final cpu -> gte writes before RTPT
|
nop2, gte_cmdw_rotate_translate_perspective_triple, // 2 nops retire the final cpu -> gte writes before RTPT
|
||||||
gte_cmdw_nclip,
|
gte_cmdw_nclip,
|
||||||
|
|||||||
@@ -43,6 +43,7 @@
|
|||||||
#pragma region Hello Camera Headers
|
#pragma region Hello Camera Headers
|
||||||
# include "gen/macs.h"
|
# include "gen/macs.h"
|
||||||
# include "gen/offsets.h"
|
# include "gen/offsets.h"
|
||||||
|
# include "gen/auto_reg.h"
|
||||||
|
|
||||||
#include "hello_camera.h"
|
#include "hello_camera.h"
|
||||||
#pragma endregion Hello Camera Headers
|
#pragma endregion Hello Camera Headers
|
||||||
@@ -51,9 +52,15 @@
|
|||||||
#include "hello_camera.atom.c"
|
#include "hello_camera.atom.c"
|
||||||
#pragma endregion Hello Joypad TUs
|
#pragma endregion Hello Joypad TUs
|
||||||
|
|
||||||
|
enum {
|
||||||
|
Scratchpad_Loc = 0x1F800000,
|
||||||
|
};
|
||||||
|
#define C_scratch(type) C_(type, Scratchpad_Loc)
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
Scratchpad_Len = 1024,
|
Scratchpad_Len = 1024,
|
||||||
MemTape_Len = 512,
|
MemTape_Len = 512,
|
||||||
|
ResolveLookAtArena_Words = 512,
|
||||||
};
|
};
|
||||||
typedef Struct_(SMemory) {
|
typedef Struct_(SMemory) {
|
||||||
PrimitiveArena primitives;
|
PrimitiveArena primitives;
|
||||||
@@ -74,7 +81,11 @@ typedef Struct_(SMemory) {
|
|||||||
PadBiosRaw pad_raw[2];
|
PadBiosRaw pad_raw[2];
|
||||||
PadState pad[2];
|
PadState pad[2];
|
||||||
|
|
||||||
|
// TODO(Ed): We don't need this we can just cast at any point an address to a desired view of scratchpad, we have the address.
|
||||||
U4_V scratchpad; // d-cache
|
U4_V scratchpad; // d-cache
|
||||||
|
|
||||||
|
U4 resolve_look_at_mem[ResolveLookAtArena_Words];
|
||||||
|
MipsAtom* resolve_look_at_atom_addrs[7];
|
||||||
};
|
};
|
||||||
global SMemory smem;
|
global SMemory smem;
|
||||||
extern SMemory smem;
|
extern SMemory smem;
|
||||||
@@ -119,6 +130,165 @@ resolve_look_at_c11(MT3_S2S4* look_at, P3_S4* eye, P3_S4* target, V3_S4* up_in)
|
|||||||
trans_m3s2( look_at, & off);
|
trans_m3s2( look_at, & off);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Pre-build all 7 chain atoms of the resolve_look_at bundle into the static arena.
|
||||||
|
* Called ONCE from main() before the frame loop.
|
||||||
|
* After this returns, the smem.resolve_look_at_atom_addrs[] array contains valid MIPS atom pointers
|
||||||
|
* for the frame-time bundle helper to emit via tb_emit(tb, captured_addr).
|
||||||
|
*
|
||||||
|
* 4 unique procs in hello_camera.atom.c (chain atoms 0, 2, 4, 6); atoms 1, 3, 5
|
||||||
|
* share the GENERIC normalize_v3s4_proc from gte.atom.c (called 3x with different
|
||||||
|
* O_(ResolveLookAtScratch,...) offsets):
|
||||||
|
* 0: resolve_look_at__input_and_sub_proc
|
||||||
|
* 1: normalize_v3s4_proc (fwd → uz; offsets 0, 16)
|
||||||
|
* 2: resolve_look_at__cross_uz_up_in_to_right_proc
|
||||||
|
* 3: normalize_v3s4_proc (right → ux; offsets 32, 48)
|
||||||
|
* 4: resolve_look_at__cross_uz_ux_to_up_proc
|
||||||
|
* 5: normalize_v3s4_proc (up → uy; offsets 64, 80)
|
||||||
|
* 6: resolve_look_at__populate_and_translate_proc
|
||||||
|
*
|
||||||
|
* Task 12.16 promotion: the bundle-specific resolve_look_at__chain_normalize_proc
|
||||||
|
* has been promoted to the generic normalize_v3s4_proc (gte.atom.c), which now
|
||||||
|
* takes r_scratch + r_src_offset + r_dst_offset as U4 parameters. The 3 callers
|
||||||
|
* pass O_(ResolveLookAtScratch,...) macros as offset args. The metaprogram emits
|
||||||
|
* one set of `atom_offset__normalize_v3s4__srav_path__aligned_done` defs
|
||||||
|
* (namespaced by atom name) in duffle/gen/offsets.h, shared by all 3 callers.
|
||||||
|
*
|
||||||
|
* GPR pool per atom: 10 free GPRs (R_T0..R_T3 + R_T5..R_T7 + R_V0 + R_V1 + R_AT).
|
||||||
|
* R_T4 is reserved as the wave-context carrier (R_ResolveScratch).
|
||||||
|
*/
|
||||||
|
internal void resolve_look_at_init(void) {
|
||||||
|
/* Wrap the static arena in a MipsAtomBuilder. */
|
||||||
|
AtomArena ab = atomarena_make(slice_ut_arr(smem.resolve_look_at_mem));
|
||||||
|
|
||||||
|
/* Atom 0: resolve_look_at__input_and_sub — stages eye/up_in into scratchpad,
|
||||||
|
* computes fwd = target - eye; binds R_ResolveScratch (R_T4) as the wave-context carrier for atoms 1-6.
|
||||||
|
* The body hardcodes R_AT and R_V0 as eye.y/eye.z temps (the existing sub_u(eye.x, eye.y, eye.z) chain from the prior Task 12.7 design). */
|
||||||
|
smem.resolve_look_at_atom_addrs[0] = resolve_look_at__input_and_sub_proc(& ab, R_ResolveScratch,
|
||||||
|
R_T0, /* r_target_ptr (popped from tape) */
|
||||||
|
R_T1, /* r_eye_ptr (popped from tape) */
|
||||||
|
R_T2, /* r_up_in_ptr (popped from tape) */
|
||||||
|
R_T3, R_T5, R_T6, R_T7); /* r_tmp<0-3> */
|
||||||
|
|
||||||
|
/* Atom 1: normalize_v3s4_proc
|
||||||
|
* The proc takes r_src_offset + r_dst_offset as U4 PARAMETERS — we pass the O_(...) macros here (evaluating to numeric literals 0 and 16).
|
||||||
|
* Body is identical across the 3 call sites (atoms 1, 3, 5); only the offset args differ.
|
||||||
|
* GPR pool: r_scratch (R_T4 carrier) + 9 body GPRs = 10.
|
||||||
|
* r_src_ptr (R_T0) : src ptr
|
||||||
|
* r_dst_ptr (R_T1) : dst ptr
|
||||||
|
* r_tmp (R_T2) : src.x PRESERVED (NOT clobbered by mfc2 MAC2) → fed to IR1 in stage 4
|
||||||
|
* r_mac1_scratch (R_T3) : MAC1 scratch + aligned |v|² in stage 3
|
||||||
|
* r_mac2_scratch (R_T5) : MAC2 scratch → result.x after stage 4 sra
|
||||||
|
* r_recip_est (R_T6) : src.y → result.y
|
||||||
|
* r_lzcr (R_T7) : |v|² accumulator + shift count + 1/|v| (overwritten across stages 2-4)
|
||||||
|
* r_shift (R_V0) : shift count (saved in stage 3) → sra amount in stage 4
|
||||||
|
* r_branch_tmp (R_V1) : src.z → result.z (reused after stage 1)
|
||||||
|
*/
|
||||||
|
ab.start = ab.start + ab.used;
|
||||||
|
smem.resolve_look_at_atom_addrs[1] = normalize_v3s4_proc(& ab, R_ResolveScratch,
|
||||||
|
O_(ResolveLookAtScratch, fwd), /* r_src_offset = 0 */
|
||||||
|
O_(ResolveLookAtScratch, uz), /* r_dst_offset = 16 */
|
||||||
|
R_T0, R_T1, R_T2, /* r_src_ptr, r_dst_ptr, r_tmp */
|
||||||
|
R_T3, /* r_mac1_scratch */
|
||||||
|
R_T5, /* r_mac2_scratch */
|
||||||
|
R_T6, /* r_recip_est */
|
||||||
|
R_T7, /* r_lzcr */
|
||||||
|
R_V0, /* r_shift */
|
||||||
|
R_V1); /* r_branch_tmp */
|
||||||
|
|
||||||
|
/* Atom 2: resolve_look_at__cross_uz_up_in_to_right
|
||||||
|
* out=scratch+32 (HARDCODED in body). GPR pool: r_scratch + 7 body + R_AT + R_V0 = 10. */
|
||||||
|
smem.resolve_look_at_atom_addrs[2] = resolve_look_at__cross_uz_up_in_to_right_proc(& ab, R_ResolveScratch,
|
||||||
|
R_T0, R_T1, R_T2, /* r_a, r_b, r_c (a.x/y/z → out.x/y/z) */
|
||||||
|
R_T3, /* r_d (b.x) */
|
||||||
|
R_T5, /* r_f (out ptr = scratch+32) */
|
||||||
|
R_T6, /* r_g (a ptr = scratch+16) */
|
||||||
|
R_T7); /* r_h (b ptr = scratch+128) */
|
||||||
|
|
||||||
|
/* Atom 3: normalize_v3s4_proc. */
|
||||||
|
smem.resolve_look_at_atom_addrs[3] = normalize_v3s4_proc(& ab, R_ResolveScratch,
|
||||||
|
O_(ResolveLookAtScratch, right), /* r_src_offset = 32 */
|
||||||
|
O_(ResolveLookAtScratch, ux), /* r_dst_offset = 48 */
|
||||||
|
R_T0, R_T1, R_T2,
|
||||||
|
R_T3,
|
||||||
|
R_T5,
|
||||||
|
R_T6,
|
||||||
|
R_T7,
|
||||||
|
R_V0,
|
||||||
|
R_V1);
|
||||||
|
|
||||||
|
/* Atom 4: resolve_look_at__cross_uz_ux_to_up — a=scratch+16, b=scratch+48, out=scratch+64 (HARDCODED). */
|
||||||
|
smem.resolve_look_at_atom_addrs[4] = resolve_look_at__cross_uz_ux_to_up_proc(& ab, R_ResolveScratch,
|
||||||
|
R_T0, R_T1, R_T2,
|
||||||
|
R_T3,
|
||||||
|
R_T5, /* r_f (out ptr = scratch+64) */
|
||||||
|
R_T6, /* r_g (a ptr = scratch+16) */
|
||||||
|
R_T7); /* r_h (b ptr = scratch+48) */
|
||||||
|
|
||||||
|
/* Atom 5: normalize_v3s4_proc (generic, from gte.atom.c) — src=scratch+64=up, dst=scratch+80=uy. */
|
||||||
|
smem.resolve_look_at_atom_addrs[5] = normalize_v3s4_proc(& ab, R_ResolveScratch,
|
||||||
|
O_(ResolveLookAtScratch, up), /* r_src_offset = 64 */
|
||||||
|
O_(ResolveLookAtScratch, uy), /* r_dst_offset = 80 */
|
||||||
|
R_T0, R_T1, R_T2,
|
||||||
|
R_T3,
|
||||||
|
R_T5,
|
||||||
|
R_T6,
|
||||||
|
R_T7,
|
||||||
|
R_V0,
|
||||||
|
R_V1);
|
||||||
|
|
||||||
|
/* Atom 6: resolve_look_at__populate_and_translate — write look_at->m[][] from ux/uy/uz (computed from r_scratch+offset internally),
|
||||||
|
then compute translation column t[] = R * (-eye). GPR pool: r_look_at + r_scratch + 4 ptr regs + 3 tmp regs = 9. */
|
||||||
|
smem.resolve_look_at_atom_addrs[6] = resolve_look_at__populate_and_translate_proc(& ab,
|
||||||
|
R_T0, /* r_look_at (popped from tape; MT3_S2S4*) */
|
||||||
|
R_ResolveScratch, /* r_scratch (wave-context carrier) */
|
||||||
|
R_T1, R_T3, R_T5, R_T7, /* r_pux, r_puy, r_puz, r_peye */
|
||||||
|
R_T2, R_T6, R_V0); /* r_tmp0, r_tmp1, r_tmp2 */
|
||||||
|
|
||||||
|
/* Sanity check: arena didn't overflow. */
|
||||||
|
assert(ab.used <= ResolveLookAtArena_Words);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Emit the resolve_look_at bundle into the tape. Called once per frame from update().
|
||||||
|
* The 7 chain atoms are pre-built at init time (resolve_look_at_init) and referenced by address via smem.resolve_look_at_atom_addrs[].
|
||||||
|
* Per-frame work: 7 tb_emit (atom pointer emissions) + 5 tb_data (C-side pointers for atom 0 + look_at for atom 6).
|
||||||
|
*
|
||||||
|
* Binds_ contract (the field-name labels are for human readability):
|
||||||
|
* Atom 0 input_and_sub target(4) eye(4) up_in(4) scratch_base(4) = 4 words
|
||||||
|
* Atoms 1-5 (no tape data — atom uses r_scratch + offset internally)
|
||||||
|
* Atom 6 populate_and_translate look_at(4) = 1 word
|
||||||
|
* ----
|
||||||
|
* 5 tb_data words total per frame.
|
||||||
|
*/
|
||||||
|
I_ void resolve_look_at(
|
||||||
|
TapeBuilder_R tb
|
||||||
|
, MT3_S2S4* look_at
|
||||||
|
, P3_S4* eye
|
||||||
|
, P3_S4* target
|
||||||
|
, V3_S4* up_in
|
||||||
|
){
|
||||||
|
// tb_emit_bundle(tb, slice_from_array(MipsAtom, smem.resolve_look_at_atom_addrs));
|
||||||
|
|
||||||
|
/* Atom 0: input_and_sub — stages eye/up_in into scratchpad + computes fwd. */
|
||||||
|
tb_emit(tb, smem.resolve_look_at_atom_addrs[0]); {
|
||||||
|
tb_data(tb, u4_(target)); /* Binds_ResolveLookAtSub.target (C-side P3_S4*) */
|
||||||
|
tb_data(tb, u4_(eye)); /* Binds_ResolveLookAtSub.eye (C-side P3_S4*) */
|
||||||
|
tb_data(tb, u4_(up_in)); /* Binds_ResolveLookAtSub.up_in (C-side V3_S4*) */
|
||||||
|
tb_data(tb, u4_(smem.scratchpad)); /* Binds_ResolveLookAtScratch.scratch_base */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Atoms 1-5: disabled (atom 1 verification below) */
|
||||||
|
tb_emit(tb, smem.resolve_look_at_atom_addrs[1]); { }
|
||||||
|
// tb_emit(tb, smem.resolve_look_at_atom_addrs[2]); { }
|
||||||
|
// tb_emit(tb, smem.resolve_look_at_atom_addrs[3]); { }
|
||||||
|
// tb_emit(tb, smem.resolve_look_at_atom_addrs[4]); { }
|
||||||
|
// tb_emit(tb, smem.resolve_look_at_atom_addrs[5]); { }
|
||||||
|
|
||||||
|
// /* Atom 6: populate_and_translate — only output pointer is the matrix destination. */
|
||||||
|
// tb_emit(tb, smem.resolve_look_at_atom_addrs[6]); {
|
||||||
|
// tb_data(tb, u4_(look_at)); /* Binds_ResolveLookAtPopAndTrans.look_at (MT3_S2S4*) */
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
FI_ void camera_look_at_c11(Camera* c, P3_S4* target, V3_S4* up_in) { resolve_look_at_c11(& c->look_at, & c->pos, target, up_in); }
|
FI_ void camera_look_at_c11(Camera* c, P3_S4* target, V3_S4* up_in) { resolve_look_at_c11(& c->look_at, & c->pos, target, up_in); }
|
||||||
|
|
||||||
GCC_OPTIMIZATION_DISABLE
|
GCC_OPTIMIZATION_DISABLE
|
||||||
@@ -171,72 +341,38 @@ void update(PrimitiveArena* pa, U4* ordering_buf)
|
|||||||
A2_S2 p; //???
|
A2_S2 p; //???
|
||||||
S4 flag; //????
|
S4 flag; //????
|
||||||
|
|
||||||
// Camera Look at
|
if (0) {
|
||||||
if (0)
|
|
||||||
{
|
|
||||||
camera_look_at_c11(& smem.cam, & smem.cube.pos, & v3s4(0, -fp_one, 0));
|
camera_look_at_c11(& smem.cam, & smem.cube.pos, & v3s4(0, -fp_one, 0));
|
||||||
}
|
}
|
||||||
// Camera look at (Tape)
|
|
||||||
if (1)
|
if (1)
|
||||||
{
|
{
|
||||||
MT3_S2S4* look_at = & smem.cam.look_at;
|
tb.used = 0; tb_scope_run(& tb) {
|
||||||
P3_S4* eye = & smem.cam.pos;
|
resolve_look_at(& tb, & smem.cam.look_at, & smem.cam.pos, & smem.cube.pos, & v3s4(0, -fp_one, 0));
|
||||||
V3_S4* up_in = & v3s4(0, -fp_one, 0);
|
}
|
||||||
|
|
||||||
V3_S4 right, up, forward;
|
V3_S4 right, up, forward;
|
||||||
V3_S4 ux, uy, uz;
|
V3_S4 ux, uy, uz;
|
||||||
V3_S4 pos, off;
|
V3_S4 pos, off;
|
||||||
|
|
||||||
tb.used = 0; tb_scope_run(& tb) {
|
ResolveLookAtScratch_V scratch = C_scratch(ResolveLookAtScratch_V);
|
||||||
// tb_emit_bundle(resolve_look_at);
|
|
||||||
{
|
|
||||||
tb_emit_(resolve_look_at); {
|
|
||||||
tb_data_(look_at, & smem.cam.look_at);
|
|
||||||
tb_data_(eye, & smem.cam.pos);
|
|
||||||
tb_data_(target, & smem.cube.pos);
|
|
||||||
tb_data_(up_in, up_in);
|
|
||||||
// tb_emit(a_normalize_v3s4(/*Todo: resolve dependent register allocation*/));
|
|
||||||
// tb_data_(fwd_out);
|
|
||||||
}
|
|
||||||
#if 0
|
|
||||||
{
|
|
||||||
tb_emit_(resolve_look_at__resolve_right); {
|
|
||||||
//...
|
|
||||||
tb_emit_(a_normalize_v3s4(...));
|
|
||||||
tb_data_(right_out);
|
|
||||||
}
|
|
||||||
tb_emit(resolve_look_at__resolve_up); {
|
|
||||||
//...
|
|
||||||
tb_emit_(ac_normalize_v3s4(...));
|
|
||||||
tb_data_(up_out);
|
|
||||||
}
|
|
||||||
tb_emit(world_to_cam_expand_mt3_s2s4(...)); {
|
|
||||||
tb_data(look_at, & smem.cam.look_at);
|
|
||||||
}
|
|
||||||
tb_emit_(resolve_look_at__final); {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// forward = target[0]; sub_v3s4(& forward, eye[0]); // RGA(Lengyel): Affine point - point = zero-weight direction.
|
// Atom 0: Works (tape emits fwd to scratch+0; C-side reads it back)
|
||||||
// normalize_v3s4(& forward, & uz); // RGA(Lengyel): Normalize the direction bulk. Not finite-point unitization.
|
forward = scratch->fwd;
|
||||||
|
|
||||||
cross_v3s4(& uz, up_in, & right); normalize_v3s4(& right, & ux); // RGA(Lengyel): Complement(Wedge(forward, up_in)) -> right axis.
|
// C-side normalize fallback (atom 1 disabled)
|
||||||
cross_v3s4(& uz, & ux, & up); normalize_v3s4(& up, & uy); // RGA(Lengyel): Complement(Wedge(forward, right)) -> up axis.
|
// normalize_v3s4(& forward, & uz);
|
||||||
|
uz = scratch->uz; /* tape-side: enable after verifying atom 1 fix */
|
||||||
|
|
||||||
// RGA(Lengyel): matrix expansion of the world-to-camera rotation (basis rows).
|
cross_v3s4(& uz, & v3s4(0, -fp_one, 0), & right); normalize_v3s4(& right, & ux);
|
||||||
look_at->m[0][0] = ux.x; look_at->m[0][1] = ux.y; look_at->m[0][2] = ux.z;
|
cross_v3s4(& uz, & ux, & up); normalize_v3s4(& up, & uy);
|
||||||
look_at->m[1][0] = uy.x; look_at->m[1][1] = uy.y; look_at->m[1][2] = uy.z;
|
|
||||||
look_at->m[2][0] = uz.x; look_at->m[2][1] = uz.y; look_at->m[2][2] = uz.z;
|
|
||||||
|
|
||||||
pos = eye[0]; mul_v3s4(& pos, v3s4(-1,-1,-1)); // RGA(Lengyel): -eye in world coordinates (spatial bulk only; implicit weight is dropped).
|
smem.cam.look_at.m[0][0] = ux.x; smem.cam.look_at.m[0][1] = ux.y; smem.cam.look_at.m[0][2] = ux.z;
|
||||||
|
smem.cam.look_at.m[1][0] = uy.x; smem.cam.look_at.m[1][1] = uy.y; smem.cam.look_at.m[1][2] = uy.z;
|
||||||
|
smem.cam.look_at.m[2][0] = uz.x; smem.cam.look_at.m[2][1] = uz.y; smem.cam.look_at.m[2][2] = uz.z;
|
||||||
|
|
||||||
// RGA(Lengyel): R * (-eye) -- full matrix translation column.
|
pos = smem.cam.pos; mul_v3s4(& pos, v3s4(-1,-1,-1)); // RGA(Lengyel): -eye in world coordinates (spatial bulk only; implicit weight is dropped).
|
||||||
// Motor translator would store half this displacement in m.xyz; GTE consumes full column.
|
|
||||||
mul_m3s2_v3s4(look_at, & pos, & off);
|
mul_m3s2_v3s4(& smem.cam.look_at, & pos, & off);
|
||||||
trans_m3s2( look_at, & off);
|
trans_m3s2( & smem.cam.look_at, & off);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw cube
|
// Draw cube
|
||||||
@@ -273,7 +409,7 @@ void update(PrimitiveArena* pa, U4* ordering_buf)
|
|||||||
tb_data(& tb, u4_(& pa->used));
|
tb_data(& tb, u4_(& pa->used));
|
||||||
tb_data(& tb, prim_base);
|
tb_data(& tb, prim_base);
|
||||||
}
|
}
|
||||||
tape_run(tb_slice(tb));
|
tape_run_a02_s07(tb_slice(tb));// Fire off the tape (bigger-clobber variant).
|
||||||
|
|
||||||
// smem.cube.rot.y += 30;
|
// smem.cube.rot.y += 30;
|
||||||
}
|
}
|
||||||
@@ -315,7 +451,7 @@ void update(PrimitiveArena* pa, U4* ordering_buf)
|
|||||||
tb_data(& tb, u4_(& pa->used));
|
tb_data(& tb, u4_(& pa->used));
|
||||||
tb_data(& tb, prim_base);
|
tb_data(& tb, prim_base);
|
||||||
}
|
}
|
||||||
tape_run(tb_slice(tb));// Fire off the tape.
|
tape_run_a02_s07(tb_slice(tb));// Fire off the tape (bigger-clobber variant).
|
||||||
|
|
||||||
// C-side state (pa->used) has already been updated by the tape!
|
// C-side state (pa->used) has already been updated by the tape!
|
||||||
// smem.floor.rot.y += 5;
|
// smem.floor.rot.y += 5;
|
||||||
@@ -342,7 +478,8 @@ GCC_OPTIMIZATION_DISABLE
|
|||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
smem = (SMemory){0};
|
smem = (SMemory){0};
|
||||||
smem.scratchpad = C_(U4_V, 0x1F800000);
|
// TODO(Ed): remove this field we don't need it in smem.
|
||||||
|
smem.scratchpad = C_(U4_V, Scratchpad_Loc);
|
||||||
// smem.primitives.used = 0;
|
// smem.primitives.used = 0;
|
||||||
// smem.active_buf_id = 0;
|
// smem.active_buf_id = 0;
|
||||||
smem.cam.pos = v3s4(500, -1000, -1500);
|
smem.cam.pos = v3s4(500, -1000, -1500);
|
||||||
@@ -365,6 +502,10 @@ int main(void)
|
|||||||
reset_graph(0);
|
reset_graph(0);
|
||||||
/* Direct BIOS: poll both ports during VBlank. */
|
/* Direct BIOS: poll both ports during VBlank. */
|
||||||
pad_bios_init_start(& smem.pad_raw[0], & smem.pad_raw[1]);
|
pad_bios_init_start(& smem.pad_raw[0], & smem.pad_raw[1]);
|
||||||
|
|
||||||
|
/* Pre-build the resolve_look_at bundle atoms into the static arena. */
|
||||||
|
resolve_look_at_init();
|
||||||
|
|
||||||
/* Pinned registers for the GPU init atom. */
|
/* Pinned registers for the GPU init atom. */
|
||||||
register U4* io_base_addr rgcc(R_IO_BaseAddr) = u4_r(IO_BASE_ADDR);
|
register U4* io_base_addr rgcc(R_IO_BaseAddr) = u4_r(IO_BASE_ADDR);
|
||||||
register DoubleBuffer* screen_buf rgcc(R_ScreenBuf) = & smem.screen_buf;
|
register DoubleBuffer* screen_buf rgcc(R_ScreenBuf) = & smem.screen_buf;
|
||||||
@@ -384,3 +525,4 @@ int main(void)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
GCC_OPTIMIZATION_ENABLE
|
GCC_OPTIMIZATION_ENABLE
|
||||||
|
|
||||||
|
|||||||
@@ -24,8 +24,8 @@ ATOM_FILE_DEBUGGER_LINE_MARKER(hello_joypad_atom_c);
|
|||||||
|
|
||||||
#pragma region MACs (Mips Atom components)
|
#pragma region MACs (Mips Atom components)
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_put_disp_env(U4 reg_transfer, U4 reg_base, U2 port)
|
FI_ Slice_MipsCode ac_put_disp_env(MipsAtomBuilder_R ab, U4 reg_transfer, U4 reg_base, U2 port)
|
||||||
MipsAtomComp_Proc_(ac_put_disp_env, {
|
MipsAtomComp_Proc_(ac_put_disp_env, ab, {
|
||||||
// Emits 5 GP0 commands for buffer 0 (display_area = (0,0,320,240)).
|
// Emits 5 GP0 commands for buffer 0 (display_area = (0,0,320,240)).
|
||||||
// Sequence per libpsyx PutDispEnv: DrawArea TL → DrawArea BR → Mask → DrawArea TL → DrawArea BR
|
// Sequence per libpsyx PutDispEnv: DrawArea TL → DrawArea BR → Mask → DrawArea TL → DrawArea BR
|
||||||
mac_gcmd_push(gp0_word_draw_area_top_left_origin, reg_transfer, reg_base, port),
|
mac_gcmd_push(gp0_word_draw_area_top_left_origin, reg_transfer, reg_base, port),
|
||||||
@@ -35,8 +35,8 @@ MipsAtomComp_Proc_(ac_put_disp_env, {
|
|||||||
mac_gcmd_push(gp0_word_draw_area_bottom_right_320x240, reg_transfer, reg_base, port),
|
mac_gcmd_push(gp0_word_draw_area_bottom_right_320x240, reg_transfer, reg_base, port),
|
||||||
})
|
})
|
||||||
|
|
||||||
FI_ Slice_MipsCode ac_put_draw_env(U4 reg_transfer, U4 reg_base, U2 port)
|
FI_ Slice_MipsCode ac_put_draw_env(MipsAtomBuilder_R ab, U4 reg_transfer, U4 reg_base, U2 port)
|
||||||
MipsAtomComp_Proc_(ac_put_draw_env, {
|
MipsAtomComp_Proc_(ac_put_draw_env, ab, {
|
||||||
/*
|
/*
|
||||||
* ORIGIN: each code word corresponds to the EXACT value libpsyx's PutDrawEnv function would compute for the same DrawEnv settings.
|
* ORIGIN: each code word corresponds to the EXACT value libpsyx's PutDrawEnv function would compute for the same DrawEnv settings.
|
||||||
* References:
|
* References:
|
||||||
@@ -116,7 +116,7 @@ internal MipsAtom_(screen_env_init) atom_info(atom_phase(screen_init)
|
|||||||
store_word(R_0, R_ScreenBuf, O_(DisplayEnv,vinterlace) + OA_(DoubleBuffer,display,1)),
|
store_word(R_0, R_ScreenBuf, O_(DisplayEnv,vinterlace) + OA_(DoubleBuffer,display,1)),
|
||||||
|
|
||||||
mac_store_rects2(R_0, R_ScreenY, R_ScreenX, R_ScreenY, R_ScreenBuf, O_(DrawEnv,clip_area) + OA_(DoubleBuffer,draw,0)), /* draw[0].clip_area = (0, 240, 320, 240). C11's SetDefDrawEnv writes clip.y = y_arg. */
|
mac_store_rects2(R_0, R_ScreenY, R_ScreenX, R_ScreenY, R_ScreenBuf, O_(DrawEnv,clip_area) + OA_(DoubleBuffer,draw,0)), /* draw[0].clip_area = (0, 240, 320, 240). C11's SetDefDrawEnv writes clip.y = y_arg. */
|
||||||
mac_store_v2s2( R_0, R_ScreenY, R_ScreenBuf, O_(DrawEnv,drawing_offset[0]) + OA_(DoubleBuffer,draw,0)), /* draw[0].drawing_offset[0] = (0, 240); C11 passes y_arg as ofs. */
|
mac_store_v2s2(R_0, R_ScreenY, R_ScreenBuf, O_(DrawEnv,drawing_offset[0]) + OA_(DoubleBuffer,draw,0)), /* draw[0].drawing_offset[0] = (0, 240); C11 passes y_arg as ofs. */
|
||||||
|
|
||||||
mac_store_v2s2(R_ScreenX, R_ScreenY, R_ScreenBuf, O_(DrawEnv,clip_area.width) + OA_(DoubleBuffer,draw,1)),
|
mac_store_v2s2(R_ScreenX, R_ScreenY, R_ScreenBuf, O_(DrawEnv,clip_area.width) + OA_(DoubleBuffer,draw,1)),
|
||||||
|
|
||||||
@@ -286,7 +286,7 @@ MipsAtom_(floor_f3_face) atom_info(atom_phase(floor_f3)
|
|||||||
, atom_reads( R_PrimCursor, R_FaceCursor, R_VertBase, R_OtBase)
|
, atom_reads( R_PrimCursor, R_FaceCursor, R_VertBase, R_OtBase)
|
||||||
, atom_writes(R_PrimCursor, R_FaceCursor)
|
, atom_writes(R_PrimCursor, R_FaceCursor)
|
||||||
) {
|
) {
|
||||||
mac_load_tri_indices( R_FaceCursor, R_T0, R_T1, R_T2),
|
mac_load_tri_indices(R_FaceCursor, R_T0, R_T1, R_T2),
|
||||||
mac_gte_load_tri_verts(R_VertBase, R_T0, R_T1, R_T2),
|
mac_gte_load_tri_verts(R_VertBase, R_T0, R_T1, R_T2),
|
||||||
nop2, gte_cmdw_rotate_translate_perspective_triple, // 2 nops retire the final cpu -> gte writes before RTPT
|
nop2, gte_cmdw_rotate_translate_perspective_triple, // 2 nops retire the final cpu -> gte writes before RTPT
|
||||||
gte_cmdw_nclip,
|
gte_cmdw_nclip,
|
||||||
|
|||||||
@@ -24,8 +24,8 @@
|
|||||||
* Emits 9 instructions (status/buttons/axes/attempt stores plus the
|
* Emits 9 instructions (status/buttons/axes/attempt stores plus the
|
||||||
* two-instruction zero-extended buttons load).
|
* two-instruction zero-extended buttons load).
|
||||||
*/
|
*/
|
||||||
FI_ Slice_MipsCode ac_pad_sio_write_pad_state(U4 status_val, U4 state_ptr_reg, U4 scratch_reg)
|
FI_ Slice_MipsCode ac_pad_sio_write_pad_state(MipsAtomBuilder_R ab, U4 status_val, U4 state_ptr_reg, U4 scratch_reg)
|
||||||
MipsAtomComp_Proc_(ac_pad_sio_write_pad_state, {
|
MipsAtomComp_Proc_(ac_pad_sio_write_pad_state, ab, {
|
||||||
add_ui(scratch_reg, R_0, status_val),
|
add_ui(scratch_reg, R_0, status_val),
|
||||||
store_word(scratch_reg, state_ptr_reg, O_(PadState,status)),
|
store_word(scratch_reg, state_ptr_reg, O_(PadState,status)),
|
||||||
/* FIX 2026-08-02: buttons = 0x0000FFFF = "no buttons pressed" in
|
/* FIX 2026-08-02: buttons = 0x0000FFFF = "no buttons pressed" in
|
||||||
|
|||||||
+3
-3
@@ -515,8 +515,7 @@ local function splice_c_lines(source)
|
|||||||
local splice_len = nil
|
local splice_len = nil
|
||||||
if byte == BYTE_BACKSLASH and source:byte(pos + 1) == BYTE_NEWLINE then
|
if byte == BYTE_BACKSLASH and source:byte(pos + 1) == BYTE_NEWLINE then
|
||||||
splice_len = 2
|
splice_len = 2
|
||||||
elseif byte == BYTE_BACKSLASH and source:byte(pos + 1) == BYTE_CR
|
elseif byte == BYTE_BACKSLASH and source:byte(pos + 1) == BYTE_CR and source:byte(pos + 2) == BYTE_NEWLINE then
|
||||||
and source:byte(pos + 2) == BYTE_NEWLINE then
|
|
||||||
splice_len = 3
|
splice_len = 3
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -2095,7 +2094,8 @@ local E_MAC_PREFIX_LEN = 4
|
|||||||
--- * Unknown `mac_X` (not in `component_index`): fall back to `word_counts[ident]` if present; otherwise emit one opaque event so the cycle budget accounts for the word.
|
--- * Unknown `mac_X` (not in `component_index`): fall back to `word_counts[ident]` if present; otherwise emit one opaque event so the cycle budget accounts for the word.
|
||||||
--- * Marker Tokens (`atom_label(...)` / `atom_offset(...)`): Zero events (they are pure metaprogram hints).
|
--- * Marker Tokens (`atom_label(...)` / `atom_offset(...)`): Zero events (they are pure metaprogram hints).
|
||||||
---
|
---
|
||||||
--- Cycle protection: a per-expansion `visiting` set tracks components currently on the expansion stack; a re-entry produces a deterministic `{kind = "cycle", ...}` error and aborts that branch (does NOT hang, does NOT recurse).
|
--- Cycle protection: a per-expansion `visiting` set tracks components currently on the expansion stack;
|
||||||
|
--- a re-entry produces a deterministic `{kind = "cycle", ...}` error and aborts that branch (does NOT hang, does NOT recurse).
|
||||||
---
|
---
|
||||||
--- Pure: reads `body_entry` / `component_index` / `word_counts`. Memoization is the caller's responsibility.
|
--- Pure: reads `body_entry` / `component_index` / `word_counts`. Memoization is the caller's responsibility.
|
||||||
--- Callers wanting `word_events` / `word_event_errors` precomputed for many atoms should memoize them per atom.
|
--- Callers wanting `word_events` / `word_event_errors` precomputed for many atoms should memoize them per atom.
|
||||||
|
|||||||
@@ -47,8 +47,7 @@ local function find_repo_root()
|
|||||||
return root
|
return root
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Set `package.path` (for `require("duffle")` + `require("passes.X")`) and
|
--- Set `package.path` (for `require("duffle")` + `require("passes.X")`) and `package.cpath` (for `lpeg.dll`).
|
||||||
--- `package.cpath` (for `lpeg.dll`).
|
|
||||||
---
|
---
|
||||||
--- This script does NOT touch the OS environment: no `os.setenv`, no `os.putenv`, no `$PATH` mods.
|
--- This script does NOT touch the OS environment: no `os.setenv`, no `os.putenv`, no `$PATH` mods.
|
||||||
--- It just sets `package.path` and `package.cpath` (the standard Lua way to register module search dirs).
|
--- It just sets `package.path` and `package.cpath` (the standard Lua way to register module search dirs).
|
||||||
|
|||||||
@@ -0,0 +1,355 @@
|
|||||||
|
--- passes/auto_reg.lua — Per-phase automatic GPR allocator + gen/auto_reg.h emitter.
|
||||||
|
---
|
||||||
|
--- Reads the per-source + corpus-level `atom_auto_regs` + `phase_auto_regs` registries populated by `passes/scan_source.lua`.
|
||||||
|
--- Runs a deterministic first-fit allocator in the `R_T0..R_T7 + R_V0..R_V1` pool (10 physical GPRs).
|
||||||
|
--- Emits one `#define R_<Sym>_Code R_Tn_Code` per marker into per-directory `gen/auto_reg.h`.
|
||||||
|
---
|
||||||
|
--- User-pinned GPRs : The corpus's `register_alias_registry` is consulted to exclude GPRs the user has pinned via
|
||||||
|
--- `atom_reg` + `_Code` defs (e.g. carriers like `R_ResolveScratch = R_T4 atom_reg`).
|
||||||
|
--- These GPRs are unavailable to EVERY atom's source pool.
|
||||||
|
--- Carriers are preserved across atoms by context discipline and must never be reallocated.
|
||||||
|
--- Per-atom body parsing also catches alias references (R_<Alias>) and hardcoded R_Tn references,
|
||||||
|
--- so the user can write either `R_T4` or `R_ResolveScratch` in an atom body and the pass will
|
||||||
|
--- exclude R_T4 from that atom's pool.
|
||||||
|
---
|
||||||
|
--- Conflict detection: If the user hardcodes `R_Tn` in an atom body that shares a phase with an auto-reg that picked `R_Tn`,
|
||||||
|
--- emit `phase_register_clash` as an info finding (no build stop).
|
||||||
|
--- Should be unreachable after the user-pinning + body-parsing fix above; kept as a defensive safety net.
|
||||||
|
---
|
||||||
|
--- Pool exhaustion: If a phase declares more `R_<Sym>` mappings than the 10-register pool can hold,
|
||||||
|
--- emit `phase_register_pool_exhausted` as a build-stopping error.
|
||||||
|
|
||||||
|
--- @class AutoRegResult
|
||||||
|
--- @field outputs table[] -- {kind=, path=} entries
|
||||||
|
--- @field errors table[] -- {line=, msg=} entries (build-stops)
|
||||||
|
--- @field warnings table[] -- {line=, msg=} entries (build-continues)
|
||||||
|
|
||||||
|
local _bootstrap_dir = debug.getinfo(1, "S").source:match("^@?(.*[/\\])") or "./"
|
||||||
|
local duffle = dofile(_bootstrap_dir .. "../duffle_paths.lua")
|
||||||
|
|
||||||
|
--- ════════════════════════════════════════════════════════════════════════════
|
||||||
|
--- THE GPR ALLOCATION POOL — what is allocatable, and (more importantly) WHY
|
||||||
|
--- ════════════════════════════════════════════════════════════════════════════
|
||||||
|
---
|
||||||
|
--- The auto-reg pass picks physical GPRs for `atom_auto_reg(...)` / `phase_auto_reg(...)` markers.
|
||||||
|
--- It allocates from a FIXED 10-register pool.
|
||||||
|
--- This comment block makes the inclusion AND exclusion criteria obvious so a reader doesn't have
|
||||||
|
--- to grep lottes_tape.h + mips.h to understand the design.
|
||||||
|
---
|
||||||
|
--- ── WHAT'S IN THE POOL (10 GPRs, all caller-trash per the O32 ABI) ────────
|
||||||
|
--- R_T0..R_T7 (GPR codes 8..15), R_V0..R_V1 (GPR codes 2..3)
|
||||||
|
--- The workhorse of every atom body. The uesr should be aware of atom allocation across atoms they chain.
|
||||||
|
--- If they have a collision it means either they didn't saturate the register file optimally for a phase,
|
||||||
|
--- or the may have made the workload to large for the run.
|
||||||
|
---
|
||||||
|
--- ── WHAT'S NOT IN THE POOL — and WHY (the "obvious exclusions") ────────────
|
||||||
|
--- R_T9 (GPR code 25) — R_TapePtr, the tape instruction stream pointer.
|
||||||
|
--- Owned by the tape runtime (in tape_run / tape_run_a02_s07).
|
||||||
|
--- `rgcc(R_TapePtr)` register-variable ties the C compiler's view to $t9 across the whole tape_run.
|
||||||
|
--- The auto-reg pass MUST NOT clobber this; doing so would desync the C-side tape pointer from the
|
||||||
|
--- hardware pointer and crash on the next tape_run.
|
||||||
|
---
|
||||||
|
--- R_T8 (GPR code 24) — R_AtomJmp, the atom-jump register used by the 4-word yield handshake.
|
||||||
|
--- Every `mac_yield()` / `mac_yield_tail` does `load_word R_AtomJmp, R_TapePtr, 0` then
|
||||||
|
--- `jump_reg R_AtomJmp`. The auto-reg pass MUST NOT clobber this either, or the atom dispatcher breaks.
|
||||||
|
--- Owned by the tape runtime, same family as R_TapePtr.
|
||||||
|
---
|
||||||
|
--- R_AT (GPR code 1) — Assembler temporary. Reserved by the MIPS O32 ABI for pseudoinstruction expansion
|
||||||
|
--- (lottes_tape.h:86, mips.h:93). The ISA's psuedo instructions use it as a scratch temporary.
|
||||||
|
---
|
||||||
|
--- R_A0..A3 (codes 4..7) — Function arguments. Used in tape_run_a02_s07, see below.
|
||||||
|
--- R_S0..S7 (codes 16..23) — Callee-saved. Preserved across C-ABI calls by convention.
|
||||||
|
--- The `tape_run_a02_s07` variant clobbers them deliberately, but the default `tape_run` does NOT.
|
||||||
|
--- Kept out of POOL to preserve the conservative default.
|
||||||
|
--- Add them in a separate "big clobber" pool if/when needed.
|
||||||
|
---
|
||||||
|
--- R_K0/K1 (codes 26..27) — Kernel / interrupt handler reserves. Never touched by user code; OS-internal.
|
||||||
|
--- R_GP/SP/FP/RA (codes 28..31) — Stack frame + return-address. Owned by the C compiler; never allocatable.
|
||||||
|
--- R_0 (code 0) — Hardwired zero. Cannot be written.
|
||||||
|
---
|
||||||
|
local POOL = {
|
||||||
|
"R_T0", "R_T1", "R_T2", "R_T3",
|
||||||
|
"R_T4", "R_T5", "R_T6", "R_T7",
|
||||||
|
"R_V0", "R_V1",
|
||||||
|
}
|
||||||
|
|
||||||
|
-- Map from integer MIPS GPR code (the `code` field on AliasEntry) to the physical GPR ident in POOL.
|
||||||
|
-- The standard MIPS O32 ABI register numbering matches mips.h's R_*_Code #defines (mips.h).
|
||||||
|
-- Only the POOL entries matter for auto_reg — non-pool aliases
|
||||||
|
-- (R_AT=1, R_A0..A3=4..7, R_T8=24, R_T9=25, R_K0/K1=26..27, R_GP/SP/FP/RA=28..31)
|
||||||
|
-- are deliberately omitted — see the comment block above for the WHY of each exclusion.
|
||||||
|
local INT_CODE_TO_POOL_GPR = {
|
||||||
|
[2] = "R_V0", [3] = "R_V1",
|
||||||
|
[8] = "R_T0", [9] = "R_T1", [10] = "R_T2", [11] = "R_T3",
|
||||||
|
[12] = "R_T4", [13] = "R_T5", [14] = "R_T6", [15] = "R_T7",
|
||||||
|
}
|
||||||
|
|
||||||
|
-- Stable sort for deterministic allocation order.
|
||||||
|
local function stable_sort_keys(tbl)
|
||||||
|
local keys = {}
|
||||||
|
for k in pairs(tbl) do keys[#keys + 1] = k end
|
||||||
|
table.sort(keys)
|
||||||
|
return keys
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Allocate one phase's auto-reg mappings.
|
||||||
|
-- Returns (allocated_map, errors). On pool exhaustion, errors is populated and the function halts.
|
||||||
|
local function allocate_phase(phase_label, decls)
|
||||||
|
-- Deep-copy POOL into a fresh sequence table. The original `table.unpack and table.unpack(POOL) or { unpack(POOL) }`
|
||||||
|
-- idiom wraps the unpacked values in a single inner table under LuaJIT 5.1 (`table.unpack` is nil; the `or` returns one value),
|
||||||
|
-- which corrupts the pool into `{ {R_T0, R_T1, ...} }` — making `table.remove(pool, 1)` return the inner table on iteration.
|
||||||
|
local pool = {}
|
||||||
|
for i = 1, #POOL do pool[i] = POOL[i] end
|
||||||
|
local result = {}
|
||||||
|
local errors = {}
|
||||||
|
for _, sym in ipairs(stable_sort_keys(decls)) do
|
||||||
|
local next_gpr = table.remove(pool, 1)
|
||||||
|
if not next_gpr then
|
||||||
|
errors[#errors + 1] = {
|
||||||
|
line = 0,
|
||||||
|
msg = string.format("phase_register_pool_exhausted: "
|
||||||
|
.. "phase '%s' requested symbol '%s' but the pool has no remaining registers "
|
||||||
|
.. "(max 10 per phase: R_T0..R_T7 + R_V0..R_V1). Split the phase or use hardcoded GPRs."
|
||||||
|
, phase_label, sym),
|
||||||
|
}
|
||||||
|
return result, errors
|
||||||
|
end
|
||||||
|
result[sym] = next_gpr
|
||||||
|
end
|
||||||
|
return result, errors
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Build two projections from corpus.register_alias_registry:
|
||||||
|
-- user_pinned -- { [physical_gpr_ident] = true } -- GPRs unavailable to auto_reg globally (wave-context carriers, file-scope pinned aliases)
|
||||||
|
-- alias_to_gpr -- { [alias_ident] = physical_gpr_ident } -- for body parsing
|
||||||
|
-- Both projections are derived from the same set of entries: every AliasEntry in register_alias_registry has `has_atom_reg = true`
|
||||||
|
-- (only those entries are added to the registry; see passes/scan_source.lua parse_enum_entry).
|
||||||
|
-- Each entry's `code` is the integer MIPS GPR number (0..31); INT_CODE_TO_POOL_GPR translates it back to the physical GPR ident.
|
||||||
|
-- Aliases whose `code` points to a non-POOL GPR (e.g. R_S0, R_T8, R_K1) are ignored —
|
||||||
|
-- they don't affect the auto_reg pool, and they're already excluded from POOL above.
|
||||||
|
local function build_user_pins(corpus)
|
||||||
|
local user_pinned = {}
|
||||||
|
local alias_to_gpr = {}
|
||||||
|
if not corpus.register_alias_registry then return user_pinned, alias_to_gpr end
|
||||||
|
for alias_name, alias_entry in pairs(corpus.register_alias_registry) do
|
||||||
|
if alias_entry.has_atom_reg and alias_entry.code then
|
||||||
|
local gpr = INT_CODE_TO_POOL_GPR[alias_entry.code]
|
||||||
|
if gpr then
|
||||||
|
user_pinned[gpr] = true
|
||||||
|
alias_to_gpr[alias_name] = gpr
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return user_pinned, alias_to_gpr
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Find every physical GPR referenced in the atom body, via EITHER:
|
||||||
|
-- (a) A hardcoded physical GPR ident (R_T\d+|R_V\d+|R_A\d+|R_S\d+) — the existing regex;
|
||||||
|
-- (b) An alias ident (R_<Alias>) resolved via alias_to_gpr back to its physical GPR ident.
|
||||||
|
-- Returns { [physical_gpr_ident] = count }. Clash-detection and source-pool-exclusion logic
|
||||||
|
-- only needs the presence of each GPR (boolean test), but keeping count preserves the
|
||||||
|
-- original find_hardcoded_rn shape so callers can switch without churn.
|
||||||
|
-- The alias pattern is sorted lexicographically to keep the regex deterministic.
|
||||||
|
local function find_used_gprs(body_text, alias_to_gpr)
|
||||||
|
local found = {}
|
||||||
|
-- (a) Hardcoded physical GPRs (R_T0..R_T7, R_V0..R_V1, R_A0..R_A3, R_S0..R_S7).
|
||||||
|
for gpr in body_text:gmatch("(R_T%d+|R_V%d+|R_A%d+|R_S%d+)") do
|
||||||
|
found[gpr] = (found[gpr] or 0) + 1
|
||||||
|
end
|
||||||
|
-- (b) Alias references (R_<Alias>) resolved to physical GPRs via the registry.
|
||||||
|
-- Sorted by name so the regex is byte-stable across runs.
|
||||||
|
if alias_to_gpr and next(alias_to_gpr) then
|
||||||
|
local aliases = {}
|
||||||
|
for alias_name in pairs(alias_to_gpr) do
|
||||||
|
aliases[#aliases + 1] = alias_name
|
||||||
|
end
|
||||||
|
table.sort(aliases)
|
||||||
|
local pattern = "(" .. table.concat(aliases, "|") .. ")"
|
||||||
|
for alias_name in body_text:gmatch(pattern) do
|
||||||
|
local gpr = alias_to_gpr[alias_name]
|
||||||
|
if gpr and not found[gpr] then
|
||||||
|
found[gpr] = 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return found
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Emit one gen/auto_reg.h header per directory.
|
||||||
|
local function emit_auto_reg_h(out_dir, dir, sources, mappings)
|
||||||
|
if not mappings or next(mappings) == nil then return end
|
||||||
|
local out_path = out_dir .. "/" .. "auto_reg.h"
|
||||||
|
duffle.ensure_dir(out_dir)
|
||||||
|
local lines = {
|
||||||
|
"#ifdef INTELLISENSE_DIRECTIVES",
|
||||||
|
"#pragma once",
|
||||||
|
"#endif",
|
||||||
|
"// Auto-generated by ps1_meta.lua (passes/auto_reg.lua) — DO NOT EDIT",
|
||||||
|
"// Directory: " .. dir:gsub("/", "\\"),
|
||||||
|
}
|
||||||
|
for _, src in ipairs(sources) do
|
||||||
|
lines[#lines + 1] = "// source: " .. src.path
|
||||||
|
end
|
||||||
|
lines[#lines + 1] = "// Per-phase register allocations resolved by the lua pass."
|
||||||
|
lines[#lines + 1] = "// R_<Sym>_Code = <chosen GPR's _Code constant> for every marker in this directory."
|
||||||
|
lines[#lines + 1] = ""
|
||||||
|
for _, sym in ipairs(stable_sort_keys(mappings)) do
|
||||||
|
local gpr = mappings[sym]
|
||||||
|
local gpr_code = gpr .. "_Code"
|
||||||
|
lines[#lines + 1] = "#define " .. sym .. "_Code " .. gpr_code
|
||||||
|
end
|
||||||
|
lines[#lines + 1] = ""
|
||||||
|
duffle.write_file_lf(out_path, table.concat(lines, "\n") .. "\n")
|
||||||
|
print(" -> " .. out_path)
|
||||||
|
return out_path
|
||||||
|
end
|
||||||
|
|
||||||
|
-- ════════════════════════════════════════════════════════════════════════════
|
||||||
|
-- Pass entry
|
||||||
|
-- ════════════════════════════════════════════════════════════════════════════
|
||||||
|
|
||||||
|
local M = {}
|
||||||
|
|
||||||
|
--- @param ctx PassCtx
|
||||||
|
--- @return AutoRegResult
|
||||||
|
function M.run(ctx)
|
||||||
|
local outputs = {}
|
||||||
|
local errors = {}
|
||||||
|
local warnings = {}
|
||||||
|
|
||||||
|
local corpus = ctx.shared and ctx.shared.corpus
|
||||||
|
if type(corpus) ~= "table" then
|
||||||
|
error("auto_reg.run requires ctx.shared.corpus", 0)
|
||||||
|
end
|
||||||
|
|
||||||
|
-- 0. Build the user-pinned GPR exclusion set + alias-to-GPR resolution map.
|
||||||
|
-- Wave-context carriers (e.g. `R_ResolveScratch = R_T4 atom_reg` in hello_camera.atom.c)
|
||||||
|
-- MUST NOT be allocated to any auto-reg marker — they're preserved across atoms by the wave-context discipline.
|
||||||
|
-- The corpus's register_alias_registry is the source of truth for these opt-in pins.
|
||||||
|
-- Body references to those aliases (via alias_to_gpr) are also excluded on a per-atom basis in step 2 below.
|
||||||
|
local user_pinned, alias_to_gpr = build_user_pins(corpus)
|
||||||
|
|
||||||
|
-- 1. Allocate phase pools first (phase declarations take precedence over per-atom declarations).
|
||||||
|
local phase_allocations = {}
|
||||||
|
for phase_label, decls in pairs(corpus.phase_auto_regs or {}) do
|
||||||
|
local mapping, errs = allocate_phase(phase_label, decls)
|
||||||
|
for sym, gpr in pairs(mapping) do
|
||||||
|
phase_allocations[phase_label] = phase_allocations[phase_label] or {}
|
||||||
|
phase_allocations[phase_label][sym] = gpr
|
||||||
|
end
|
||||||
|
for _, e in ipairs(errs) do
|
||||||
|
errors[#errors + 1] = e
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- 2. Allocate per-atom auto-regs. If the atom scope matches a phase, reuse the phase pool.
|
||||||
|
-- Otherwise, allocate a private pool for the atom.
|
||||||
|
-- The phase membership is in `corpus.atom_phases[phase_label].atoms` (an array of atom names declared via `atom_phase(<phase>)`
|
||||||
|
-- in the atom's `atom_info` line). Build a reverse map `atom_name -> phase_label` so the lookup is O(1) per atom scope.
|
||||||
|
local atom_name_to_phase = {}
|
||||||
|
for phase_label, entry in pairs(corpus.atom_phases or {}) do
|
||||||
|
for _, atom_name in ipairs(entry.atoms or {}) do
|
||||||
|
atom_name_to_phase[atom_name] = phase_label
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local atom_allocations = {}
|
||||||
|
for atom_scope, decls in pairs(corpus.atom_auto_regs or {}) do
|
||||||
|
local phase_label = atom_name_to_phase[atom_scope]
|
||||||
|
-- Build the atom's source pool: start with the full POOL, subtract:
|
||||||
|
-- (a) every GPR already committed (phase allocations + prior atom allocations)
|
||||||
|
-- (b) every USER-PINNED GPR (wave-context carriers + file-scope pinned aliases)
|
||||||
|
-- (c) every GPR referenced in the atom's body — either hardcoded R_X or alias R_Xxx
|
||||||
|
-- (the latter resolved via alias_to_gpr; this catches cases where the user wrote R_ResolveScratch instead of R_T4 directly)
|
||||||
|
-- Atoms whose scope matches a phase share the global pool with the phase allocations;
|
||||||
|
-- the original `source_pool = phase_allocations[phase_label]` form used the phase
|
||||||
|
-- allocation MAP as a pool, but that map has no array part, so `table.remove(source_pool, 1)`
|
||||||
|
-- returned nil and every atom-with-phase marker errored with `phase_register_pool_exhausted`.
|
||||||
|
local used = {}
|
||||||
|
for _, m in pairs(phase_allocations) do for _, gpr in pairs(m) do used[gpr] = true end end
|
||||||
|
for _, m in pairs(atom_allocations) do for _, gpr in pairs(m) do used[gpr] = true end end
|
||||||
|
-- (c) Body references — scan the atom body for hardcoded + alias-resolved GPRs.
|
||||||
|
-- Folded into `used` so the source_pool exclusion is a single check.
|
||||||
|
local atom = corpus.atoms_by_name and corpus.atoms_by_name[atom_scope]
|
||||||
|
if atom and atom.body then
|
||||||
|
local body_used = find_used_gprs(atom.body, alias_to_gpr)
|
||||||
|
for gpr in pairs(body_used) do used[gpr] = true end
|
||||||
|
end
|
||||||
|
local source_pool = {}
|
||||||
|
for _, gpr in ipairs(POOL) do
|
||||||
|
-- Exclude (a) prior commitments, (b) USER-PINNED GPRs (wave-context carriers
|
||||||
|
-- declared via atom_reg + _Code defs, preserved across atoms globally).
|
||||||
|
if not used[gpr] and not user_pinned[gpr] then
|
||||||
|
source_pool[#source_pool + 1] = gpr
|
||||||
|
end
|
||||||
|
end
|
||||||
|
local result = {}
|
||||||
|
for _, sym in ipairs(stable_sort_keys(decls)) do
|
||||||
|
local next_gpr = table.remove(source_pool, 1)
|
||||||
|
if not next_gpr then
|
||||||
|
errors[#errors + 1] = {
|
||||||
|
line = 0,
|
||||||
|
msg = string.format("phase_register_pool_exhausted: atom '%s' requested symbol '%s' "
|
||||||
|
.. "but no free registers remain in its scope pool."
|
||||||
|
, atom_scope, sym),
|
||||||
|
}
|
||||||
|
else
|
||||||
|
result[sym] = next_gpr
|
||||||
|
end
|
||||||
|
end
|
||||||
|
atom_allocations[atom_scope] = result
|
||||||
|
end
|
||||||
|
|
||||||
|
-- 3. Conflict-with-hardcoded detection (defensive — should be unreachable now).
|
||||||
|
-- The source_pool exclusion in step 2 (b) + (c) already accounts for both user-pinned GPRs
|
||||||
|
-- and body-referenced GPRs (hardcoded R_Tn OR alias R_<Alias>).
|
||||||
|
-- An auto-reg allocation that matched an existing body reference would be impossible by construction.
|
||||||
|
-- This warning is kept as a defensive safety net for cases the body scanner might miss
|
||||||
|
-- (e.g. macros that expand to register references the scanner cannot resolve).
|
||||||
|
-- For each resolved (scope, sym) -> R_Tn mapping, scan the atom body source for used GPRs.
|
||||||
|
for atom_scope, decls in pairs(atom_allocations) do
|
||||||
|
local atom = corpus.atoms_by_name and corpus.atoms_by_name[atom_scope]
|
||||||
|
if atom and atom.body then
|
||||||
|
local used_in_body = find_used_gprs(atom.body, alias_to_gpr)
|
||||||
|
for sym, allocated_gpr in pairs(decls) do
|
||||||
|
if used_in_body[allocated_gpr] and used_in_body[allocated_gpr] > 0 then
|
||||||
|
warnings[#warnings + 1] = {
|
||||||
|
line = atom.line or 0,
|
||||||
|
msg = string.format("phase_register_clash: atom '%s' has hardcoded '%s' in its body AND an auto-reg marker '%s' "
|
||||||
|
.. "that was allocated to '%s' (same phase). Resolve by removing the hardcoded reference or renaming the auto-reg."
|
||||||
|
, atom_scope, allocated_gpr, sym, allocated_gpr),
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- 4. Emit per-directory gen/auto_reg.h.
|
||||||
|
-- For each source directory that has atom_auto_regs or phase_auto_regs entries, emit one header.
|
||||||
|
local sources_by_dir = corpus.sources_by_dir or {}
|
||||||
|
for dir, sources in pairs(sources_by_dir) do
|
||||||
|
local per_dir_mappings = {}
|
||||||
|
for _, src in ipairs(sources) do
|
||||||
|
-- Collect every (sym -> gpr) entry that originated from a source in this directory.
|
||||||
|
-- `src.scan.atom_auto_regs` is keyed by ATOM SCOPE NAME; `pairs(t)` iterates KEYS so `scope_name` here is the scope ident (e.g. "cube_g4_face").
|
||||||
|
-- The previous `for _, scan_atom_auto` form silently assigned the VALUE (a `{sym = sym}` table) to the variable,
|
||||||
|
-- which made `atom_allocations[scan_atom_auto]` a table-indexed lookup that never resolved.
|
||||||
|
for scope_name in pairs(src.scan and src.scan.atom_auto_regs or {}) do
|
||||||
|
for sym, gpr in pairs(atom_allocations[scope_name] or {}) do
|
||||||
|
per_dir_mappings[sym] = gpr
|
||||||
|
end
|
||||||
|
end
|
||||||
|
for scope_name in pairs(src.scan and src.scan.phase_auto_regs or {}) do
|
||||||
|
for sym, gpr in pairs(phase_allocations[scope_name] or {}) do
|
||||||
|
per_dir_mappings[sym] = gpr
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
local out_dir = dir .. "/gen"
|
||||||
|
local out_path = emit_auto_reg_h(out_dir, dir, sources, per_dir_mappings)
|
||||||
|
if out_path then outputs[#outputs + 1] = { auto_reg_h = out_path } end
|
||||||
|
end
|
||||||
|
return { outputs = outputs, errors = errors, warnings = warnings }
|
||||||
|
end
|
||||||
|
|
||||||
|
return M
|
||||||
@@ -3,9 +3,12 @@
|
|||||||
--- Ownership: `corpus.word_counts`, `corpus.components`, and `corpus.component_body_index`.
|
--- Ownership: `corpus.word_counts`, `corpus.components`, and `corpus.component_body_index`.
|
||||||
--- Scanner owns `declaration_comment` and `debug_skip` on each declaration record; this pass projects both forward.
|
--- Scanner owns `declaration_comment` and `debug_skip` on each declaration record; this pass projects both forward.
|
||||||
---
|
---
|
||||||
--- Reads the pre-scanned SourceScan payload from `duffle.scan_source` for `MipsAtomComp_(ac_X)` and `MipsAtomComp_Proc_(ac_X, { body })` declarations,
|
--- Reads the pre-scanned SourceScan payload from `duffle.scan_source` for `MipsAtomComp_(ac_X)` and `MipsAtomComp_Proc_(ac_X, { body })` declarations (kind="comp_bare" / "comp_proc"),
|
||||||
--- then resolves the function-args string from the preceding `FI_ Slice_MipsCode ac_X(...)` declaration via a backward walk.
|
--- then resolves the function-args string from the preceding `FI_ Slice_MipsCode ac_X(...)` declaration via a backward walk.
|
||||||
---
|
---
|
||||||
|
--- `MipsAtom_Proc_(X, ab, { body })` declarations (kind="atom_proc") are ATOMS, not components, and are deliberately excluded —
|
||||||
|
--- atoms get emitted via `tb_emit(tb, code_<name>)` linker symbols, not inlined as `mac_*` macros.
|
||||||
|
---
|
||||||
--- Emits one `gen/macs.h` per *immediate source directory* with `#define mac_X(sig) \` macros plus `WORD_COUNT(mac_X, N)` entries for downstream offset computation.
|
--- Emits one `gen/macs.h` per *immediate source directory* with `#define mac_X(sig) \` macros plus `WORD_COUNT(mac_X, N)` entries for downstream offset computation.
|
||||||
--- All sources inside the same directory contribute to the same file (per-directory aggregation).
|
--- All sources inside the same directory contribute to the same file (per-directory aggregation).
|
||||||
--- The directory itself is the namespace, so the filename does not repeat the module name.
|
--- The directory itself is the namespace, so the filename does not repeat the module name.
|
||||||
@@ -76,7 +79,7 @@ local MACS_FILENAME = "macs.h"
|
|||||||
--- @field args string|nil -- Function-args string (function form only)
|
--- @field args string|nil -- Function-args string (function form only)
|
||||||
--- @field line integer -- Source line of the declaration
|
--- @field line integer -- Source line of the declaration
|
||||||
--- @field comment string|nil -- Scanner-owned `declaration_comment`; the components pass reads it from the scanner record
|
--- @field comment string|nil -- Scanner-owned `declaration_comment`; the components pass reads it from the scanner record
|
||||||
--- @field kind string -- "comp_bare" | "comp_proc"
|
--- @field kind string -- "comp_bare" | "comp_proc" (atom_proc is NOT a component — see `project_components`)
|
||||||
--- @field debug_skip boolean -- Mirror of `a.debug_skip` (scanner-owned); true iff a bare `atom_dbg_skip` marker immediately preceded the declaration
|
--- @field debug_skip boolean -- Mirror of `a.debug_skip` (scanner-owned); true iff a bare `atom_dbg_skip` marker immediately preceded the declaration
|
||||||
|
|
||||||
-- ════════════════════════════════════════════════════════════════════════════
|
-- ════════════════════════════════════════════════════════════════════════════
|
||||||
@@ -200,7 +203,16 @@ end
|
|||||||
local function project_components(source, scan)
|
local function project_components(source, scan)
|
||||||
local out = {}
|
local out = {}
|
||||||
for _, a in ipairs(scan.atoms) do
|
for _, a in ipairs(scan.atoms) do
|
||||||
|
-- Only `MipsAtomComp_(ac_X)` (kind="comp_bare") and `MipsAtomComp_Proc_(ac_X, ...)` (kind="comp_proc")
|
||||||
|
-- are COMPONENTS — they get inlined via `mac_<name>` aliases inside atom bodies.
|
||||||
|
-- `MipsAtom_Proc_` (kind="atom_proc") is an ATOM (ends with `mac_yield()`); it gets emitted via
|
||||||
|
-- `tb_emit(tb, code_<name>)` (linker symbol), NOT inlined as a macro. Including `atom_proc` here
|
||||||
|
-- would incorrectly emit `mac_<name>` aliases for atoms, polluting `gen/macs.h`.
|
||||||
|
-- See `docs/duffle_dsl_primer.md` §"mac_* aliases" for the contract.
|
||||||
if a.kind == "comp_bare" or a.kind == "comp_proc" then
|
if a.kind == "comp_bare" or a.kind == "comp_proc" then
|
||||||
|
-- Function-args lookup is meaningful for `MipsAtomComp_Proc_` components
|
||||||
|
-- (the macro sits inside `FI_ Slice_MipsCode ac_X(...)`); the alias expansion
|
||||||
|
-- discards the `ab` (atom-builder) arg the same way both forms do.
|
||||||
local args = find_function_args_for(source, a.raw_name, a.ident_pos)
|
local args = find_function_args_for(source, a.raw_name, a.ident_pos)
|
||||||
-- Comment ownership: scan_source.lua stamps `declaration_comment` on the record by walking backward past any associated bare marker.
|
-- Comment ownership: scan_source.lua stamps `declaration_comment` on the record by walking backward past any associated bare marker.
|
||||||
-- The pass reads `declaration_comment` directly.
|
-- The pass reads `declaration_comment` directly.
|
||||||
@@ -392,8 +404,7 @@ local function cycle_cost_rec(name, comp_by_name, latency, cache)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--- (internal) Recursive GP0 prim-buffer contribution. Count `store_word` / `store_half` / `store_byte`
|
--- (internal) Recursive GP0 prim-buffer contribution. Count `store_word` / `store_half` / `store_byte`
|
||||||
--- calls in the component body that target `R_PrimCursor` (these are the
|
--- calls in the component body that target `R_PrimCursor` (these are the RAM-side prim-buffer words the macro contributes), recursing through nested `mac_*` calls.
|
||||||
--- RAM-side prim-buffer words the macro contributes), recursing through nested `mac_*` calls.
|
|
||||||
--- Only `R_PrimCursor`-targeting stores count. Stores targeting other registers (e.g. `R_OtBase`, heap pointers) are not prim-buffer contributions.
|
--- Only `R_PrimCursor`-targeting stores count. Stores targeting other registers (e.g. `R_OtBase`, heap pointers) are not prim-buffer contributions.
|
||||||
--- @param name string
|
--- @param name string
|
||||||
--- @param comp_by_name table<string, Component>
|
--- @param comp_by_name table<string, Component>
|
||||||
@@ -475,13 +486,26 @@ local function split_comment_lines(s)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--- Determine the macro signature: function-args list (function form) or variadic-ignored (bare form).
|
--- Determine the macro signature: function-args list (function form) or variadic-ignored (bare form).
|
||||||
|
--- For `MipsAtomComp_Proc_` components, the leading `ab` (atom-builder) arg is dropped:
|
||||||
|
--- the generated `mac_<name>` macros are inline-expansion aliases for baked atoms; their bodies don't reference `ab`
|
||||||
|
--- (the builder is only consumed by the procedural `atombuilder_unroll` line that `MipsAtomComp_Proc_` appends after the body).
|
||||||
|
--- Inline callers therefore don't need to thread a builder context.
|
||||||
--- @param args_str string|nil
|
--- @param args_str string|nil
|
||||||
--- @return string
|
--- @return string
|
||||||
local function signature_from_args(args_str)
|
local function signature_from_args(args_str)
|
||||||
local arg_names = extract_arg_names(args_str)
|
local arg_names = extract_arg_names(args_str)
|
||||||
if arg_names and #arg_names > 0 then
|
if arg_names and #arg_names > 0 then
|
||||||
|
-- Drop the leading `ab` (atom-builder) first arg if present.
|
||||||
|
-- Convention: `MipsAtomComp_Proc_` components always declare `ab` as the first function-arg
|
||||||
|
-- (type `MipsAtomBuilder_R`), mirroring the macro signature in `lottes_tape.h`.
|
||||||
|
if arg_names[1] == "ab" then
|
||||||
|
table.remove(arg_names, 1)
|
||||||
|
end
|
||||||
|
if #arg_names > 0 then
|
||||||
return table.concat(arg_names, ", ")
|
return table.concat(arg_names, ", ")
|
||||||
end
|
end
|
||||||
|
return "..." -- `ab` was the only arg; fall through to variadic
|
||||||
|
end
|
||||||
return "..."
|
return "..."
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -522,7 +546,7 @@ local function build_component_lines(c, counts)
|
|||||||
|
|
||||||
-- Marker comment: emitted once for every skipped component.
|
-- Marker comment: emitted once for every skipped component.
|
||||||
-- The marker is scanner-owned (declared by `atom_dbg_skip` immediately before the declaration in the source);
|
-- The marker is scanner-owned (declared by `atom_dbg_skip` immediately before the declaration in the source);
|
||||||
-- the components pass projects `c.debug_skip` and emits the marker as a generated comment.
|
-- This pass projects `c.debug_skip` and emits the marker as a generated comment.
|
||||||
if c.debug_skip then
|
if c.debug_skip then
|
||||||
lines[#lines + 1] = "/* atom_dbg_skip */"
|
lines[#lines + 1] = "/* atom_dbg_skip */"
|
||||||
end
|
end
|
||||||
@@ -556,8 +580,8 @@ end
|
|||||||
|
|
||||||
--- Build the boilerplate header lines (the `#ifdef INTELLISENSE_DIRECTIVES` block,
|
--- Build the boilerplate header lines (the `#ifdef INTELLISENSE_DIRECTIVES` block,
|
||||||
--- the `// Auto-generated` comment, the `// Source:` line, and the self-contained `WORD_COUNT` macro definition).
|
--- the `// Auto-generated` comment, the `// Source:` line, and the self-contained `WORD_COUNT` macro definition).
|
||||||
--- @param dir string -- the absolute source directory
|
--- @param dir string -- Absolute source directory
|
||||||
--- @param sources SourceFile[] -- sources contributing to this directory (for the header comment)
|
--- @param sources SourceFile[] -- Sources contributing to this directory (for the header comment)
|
||||||
--- @return string[]
|
--- @return string[]
|
||||||
local function header_boilerplate(dir, sources)
|
local function header_boilerplate(dir, sources)
|
||||||
local source_lines = { "// Directory: " .. duffle.to_absolute_path(dir) .. "/" }
|
local source_lines = { "// Directory: " .. duffle.to_absolute_path(dir) .. "/" }
|
||||||
@@ -588,9 +612,9 @@ end
|
|||||||
--- Compute the per-directory output path for `.macs.h`.
|
--- Compute the per-directory output path for `.macs.h`.
|
||||||
--- e.g. any source in `code/duffle/` produces `code/duffle/gen/macs.h` regardless of source filename.
|
--- e.g. any source in `code/duffle/` produces `code/duffle/gen/macs.h` regardless of source filename.
|
||||||
--- The directory name is the namespace; the filename does not repeat it.
|
--- The directory name is the namespace; the filename does not repeat it.
|
||||||
--- @param dir string -- the absolute source directory
|
--- @param dir string -- Absolute source directory
|
||||||
--- @return string -- the output directory
|
--- @return string -- Output directory
|
||||||
--- @return string -- the full output path
|
--- @return string -- Full output path
|
||||||
local function compute_macs_h_path(dir)
|
local function compute_macs_h_path(dir)
|
||||||
local out_dir = dir .. "/" .. GEN_SUBDIR
|
local out_dir = dir .. "/" .. GEN_SUBDIR
|
||||||
local out_path = out_dir .. "/" .. MACS_FILENAME
|
local out_path = out_dir .. "/" .. MACS_FILENAME
|
||||||
@@ -600,11 +624,11 @@ end
|
|||||||
--- Emit a per-directory `.macs.h` header with the aggregated `mac_X` macros + `WORD_COUNT` entries.
|
--- Emit a per-directory `.macs.h` header with the aggregated `mac_X` macros + `WORD_COUNT` entries.
|
||||||
--- Writes in BINARY mode so LF line endings are preserved (the git blob is LF; Windows text-mode would emit CRLF and break the byte-identical diff).
|
--- Writes in BINARY mode so LF line endings are preserved (the git blob is LF; Windows text-mode would emit CRLF and break the byte-identical diff).
|
||||||
--- @param ctx PassCtx
|
--- @param ctx PassCtx
|
||||||
--- @param dir string -- the absolute source directory
|
--- @param dir string -- Absolute source directory
|
||||||
--- @param sources SourceFile[] -- sources contributing to this directory (for the header comment)
|
--- @param sources SourceFile[] -- Sources contributing to this directory (for the header comment)
|
||||||
--- @param components Component[] -- aggregated components from all sources in this directory
|
--- @param components Component[] -- Aggregated components from all sources in this directory
|
||||||
--- @param counts table<string, integer> -- precomputed word counts (from count_all_components)
|
--- @param counts table<string, integer> -- Precomputed word counts (from count_all_components)
|
||||||
--- @return string|nil -- path to the written file (nil if no components)
|
--- @return string|nil -- Path to the written file (nil if no components)
|
||||||
local function emit_component_macros_h(ctx, dir, sources, components, counts)
|
local function emit_component_macros_h(ctx, dir, sources, components, counts)
|
||||||
if #components == 0 then return nil end
|
if #components == 0 then return nil end
|
||||||
local out_dir, out_path = compute_macs_h_path(dir)
|
local out_dir, out_path = compute_macs_h_path(dir)
|
||||||
@@ -643,11 +667,11 @@ local function update_canonical_word_counts(corpus, components, counts)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--- @class ComponentDef
|
--- @class ComponentDef
|
||||||
--- @field name string -- bare name (without ac_/mac_ prefix)
|
--- @field name string -- Bare name (without ac_/mac_ prefix)
|
||||||
--- @field line integer -- definition source line (line of `MipsAtomComp_(ac_X)` / `MipsAtomComp_Proc_(ac_X, ...)`)
|
--- @field line integer -- Definition source line (line of `MipsAtomComp_(ac_X)` / `MipsAtomComp_Proc_(ac_X, ...)`)
|
||||||
--- @field path string -- absolute source path of the definition
|
--- @field path string -- Absolute source path of the definition
|
||||||
--- @field kind string -- "comp_bare" | "comp_proc"
|
--- @field kind string -- "comp_bare" | "comp_proc" (atom_proc is NOT a component)
|
||||||
--- @field debug_skip boolean -- mirror of the scanner-owned `a.debug_skip`; consumers read this directly
|
--- @field debug_skip boolean -- Mirror of the scanner-owned `a.debug_skip`; consumers read this directly
|
||||||
|
|
||||||
--- (internal) Populate `corpus.components` with this source's components-by-name map.
|
--- (internal) Populate `corpus.components` with this source's components-by-name map.
|
||||||
--- First declaration wins; later declarations of the same bare name are dropped and recorded as a collision via `corpus.collisions` (kind = "component").
|
--- First declaration wins; later declarations of the same bare name are dropped and recorded as a collision via `corpus.collisions` (kind = "component").
|
||||||
|
|||||||
@@ -703,9 +703,9 @@ end
|
|||||||
--- `{comp_name, call_file, call_line, comp_file, comp_line, start_pos, end_pos, body_lines, debug_skip}`. `body_lines[k]`
|
--- `{comp_name, call_file, call_line, comp_file, comp_line, start_pos, end_pos, body_lines, debug_skip}`. `body_lines[k]`
|
||||||
--- is the k-th word's source line within the component body.
|
--- is the k-th word's source line within the component body.
|
||||||
---
|
---
|
||||||
--- @param corpus table -- the corpus from `ctx.shared.corpus`
|
--- @param corpus table -- From `ctx.shared.corpus`
|
||||||
--- @param addrs table -- ELF symbols keyed by atom name from `elf_dwarf.read_nm`
|
--- @param addrs table -- ELF symbols keyed by atom name from `elf_dwarf.read_nm`
|
||||||
--- @return table[] -- list of {name, addr, size_bytes, words, entries, invocations, debug_skip?}
|
--- @return table[] -- List of {name, addr, size_bytes, words, entries, invocations, debug_skip?}
|
||||||
local function build_atom_table(corpus, addrs)
|
local function build_atom_table(corpus, addrs)
|
||||||
-- Cross-ref: keep only atoms present in BOTH the nm symbol table AND `corpus.atoms_by_name`. Output is sorted by ascending addr.
|
-- Cross-ref: keep only atoms present in BOTH the nm symbol table AND `corpus.atoms_by_name`. Output is sorted by ascending addr.
|
||||||
local atoms_by_name = corpus.atoms_by_name or {}
|
local atoms_by_name = corpus.atoms_by_name or {}
|
||||||
@@ -834,10 +834,10 @@ end
|
|||||||
--- This is intentional: silently falling back to a hardcoded GPR would mask the missing opt-in.
|
--- This is intentional: silently falling back to a hardcoded GPR would mask the missing opt-in.
|
||||||
---
|
---
|
||||||
--- Pre-tokenized: `body_tokens` is the scan-source pass's pre-split list of top-level statements (each entry is a single `load_*` call or other statement).
|
--- Pre-tokenized: `body_tokens` is the scan-source pass's pre-split list of top-level statements (each entry is a single `load_*` call or other statement).
|
||||||
--- @param body_tokens table[] -- the atom's pre-tokenized body statements (from atom.body_tokens)
|
--- @param body_tokens table[] -- The atom's pre-tokenized body statements (from atom.body_tokens)
|
||||||
--- @param binds_name string -- expected Binds_X name (skip pairs with mismatching binds)
|
--- @param binds_name string -- Expected Binds_X name (skip pairs with mismatching binds)
|
||||||
--- @param registries table -- merged registries from collect_per_source_registries
|
--- @param registries table -- Merged registries from collect_per_source_registries
|
||||||
--- @return table[] -- list of {reg = <MIPS index>, field = <field name>}
|
--- @return table[] -- List of {reg = <MIPS index>, field = <field name>}
|
||||||
local function parse_body_load_pairs(body_tokens, binds_name, registries)
|
local function parse_body_load_pairs(body_tokens, binds_name, registries)
|
||||||
local pairs = {}
|
local pairs = {}
|
||||||
local reg_index_by_name = (registries and registries.register_alias_registry) or {}
|
local reg_index_by_name = (registries and registries.register_alias_registry) or {}
|
||||||
@@ -880,9 +880,9 @@ end
|
|||||||
--- The piece chain uses (DW_OP_regN, DW_OP_piece, ULEB128(field_size)).
|
--- The piece chain uses (DW_OP_regN, DW_OP_piece, ULEB128(field_size)).
|
||||||
---
|
---
|
||||||
--- Binds fields come from `scan.binds`; the per-source `scan.binds[i].fields` already carries the typed-field record after the scan-source generalization.
|
--- Binds fields come from `scan.binds`; the per-source `scan.binds[i].fields` already carries the typed-field record after the scan-source generalization.
|
||||||
--- @param corpus table -- the corpus from `ctx.shared.corpus`
|
--- @param corpus table -- From `ctx.shared.corpus`
|
||||||
--- @param atom_table table[] -- the cross-ref'd atom table from build_atom_table
|
--- @param atom_table table[] -- Cross-ref'd atom table from build_atom_table
|
||||||
--- @param registries table -- merged registries from collect_per_source_registries
|
--- @param registries table -- Merged registries from collect_per_source_registries
|
||||||
--- @return table, table -- (rbind_atoms, rbind_structs)
|
--- @return table, table -- (rbind_atoms, rbind_structs)
|
||||||
local function parse_rbind_atoms(corpus, atom_table, registries)
|
local function parse_rbind_atoms(corpus, atom_table, registries)
|
||||||
registries = registries or {}
|
registries = registries or {}
|
||||||
@@ -944,7 +944,7 @@ local function parse_rbind_atoms(corpus, atom_table, registries)
|
|||||||
binds = ai.binds,
|
binds = ai.binds,
|
||||||
fields = struct.fields, -- {name, offset} from scan.binds
|
fields = struct.fields, -- {name, offset} from scan.binds
|
||||||
bytes = struct.bytes,
|
bytes = struct.bytes,
|
||||||
regs = pairs, -- ordered list of {reg, field}
|
regs = pairs, -- Ordered list of {reg, field}
|
||||||
info_line = ai.info_line,
|
info_line = ai.info_line,
|
||||||
}
|
}
|
||||||
table.insert(struct.atom_names, atom_name)
|
table.insert(struct.atom_names, atom_name)
|
||||||
@@ -1780,7 +1780,8 @@ local function build_inserted_children(main_cu_offset, main_cu_end_excl, atom_ta
|
|||||||
emit(uleb128(ABBREV_TYPED_VIEW_POINTER)) -- DW_TAG_pointer_type (abbrev 110; NOT 9; void chain target)
|
emit(uleb128(ABBREV_TYPED_VIEW_POINTER)) -- DW_TAG_pointer_type (abbrev 110; NOT 9; void chain target)
|
||||||
emit(elf_dwarf.write_u32_le(ref4_of(void_chain_offset))) -- 4-byte ref4: points at the void base_type's tag byte
|
emit(elf_dwarf.write_u32_le(ref4_of(void_chain_offset))) -- 4-byte ref4: points at the void base_type's tag byte
|
||||||
-- type_chain_offsets["void|1"] is what step (f) of the per-RR_<R_Name> chain looks up.
|
-- type_chain_offsets["void|1"] is what step (f) of the per-RR_<R_Name> chain looks up.
|
||||||
type_chain_offsets["void|1"] = void_chain_offset -- both the base_type offset and the pointer_type are emitted consecutively; the OUTERMOST is the pointer_type. The variable's DW_AT_type must reference the pointer_type, not the base_type. Patch below.
|
type_chain_offsets["void|1"] = void_chain_offset -- both the base_type offset and the pointer_type are emitted consecutively; the OUTERMOST is the pointer_type.
|
||||||
|
-- The variable's DW_AT_type must reference the pointer_type, not the base_type. Patch below.
|
||||||
-- Capture the pointer_type's offset (the last-thing-emitted DIE start) and overwrite the lookup.
|
-- Capture the pointer_type's offset (the last-thing-emitted DIE start) and overwrite the lookup.
|
||||||
-- The pointer_type was emitted as: uleb(9) (1 byte) + 4-byte ref4 = 5 bytes. Its tag byte is at void_chain_offset + 8 (the base_type's 8 bytes: 1 tag + 5 name + 1 byte_size + 1 encoding).
|
-- The pointer_type was emitted as: uleb(9) (1 byte) + 4-byte ref4 = 5 bytes. Its tag byte is at void_chain_offset + 8 (the base_type's 8 bytes: 1 tag + 5 name + 1 byte_size + 1 encoding).
|
||||||
local ptr_void_offset = void_chain_offset + 8
|
local ptr_void_offset = void_chain_offset + 8
|
||||||
|
|||||||
@@ -188,11 +188,11 @@ function M.run(ctx)
|
|||||||
if type(corpus.source_order) ~= "table" then error("emission_model: ctx.shared.corpus.source_order is required", 0) end
|
if type(corpus.source_order) ~= "table" then error("emission_model: ctx.shared.corpus.source_order is required", 0) end
|
||||||
|
|
||||||
-- Project once, collect errors + warnings for one atom.
|
-- Project once, collect errors + warnings for one atom.
|
||||||
-- Kind must be one of: atom | raw_atom | comp_bare | comp_proc.
|
-- Kind must be one of: atom | atom_proc | raw_atom | comp_bare | comp_proc.
|
||||||
local function process_atom(atom, src)
|
local function process_atom(atom, src)
|
||||||
if not (atom and atom.body) then return end
|
if not (atom and atom.body) then return end
|
||||||
local kind = atom.kind
|
local kind = atom.kind
|
||||||
if kind ~= "atom" and kind ~= "raw_atom" and kind ~= "comp_bare" and kind ~= "comp_proc" then
|
if kind ~= "atom" and kind ~= "atom_proc" and kind ~= "raw_atom" and kind ~= "comp_bare" and kind ~= "comp_proc" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
local proj = project_atom(atom, src, corpus)
|
local proj = project_atom(atom, src, corpus)
|
||||||
@@ -215,7 +215,7 @@ function M.run(ctx)
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- Walk `corpus.source_order`; within each source, visit atoms followed by raw_atoms.
|
-- Walk `corpus.source_order`; within each source, visit atoms followed by raw_atoms.
|
||||||
-- Recognized kinds (atom | raw_atom | comp_bare | comp_proc) each receive the atom.paths projection via duffle.project_emission.
|
-- Recognized kinds (atom | atom_proc | raw_atom | comp_bare | comp_proc) each receive the atom.paths projection via duffle.project_emission.
|
||||||
-- Components are macros inlined into atom bodies; focused tests and isolated component analyses consume atom.paths directly.
|
-- Components are macros inlined into atom bodies; focused tests and isolated component analyses consume atom.paths directly.
|
||||||
for _, src in ipairs(corpus.source_order) do
|
for _, src in ipairs(corpus.source_order) do
|
||||||
local scan = src.scan or {}
|
local scan = src.scan or {}
|
||||||
|
|||||||
@@ -4,9 +4,17 @@
|
|||||||
--- for `MipsAtom_(name)` and `MipsCode code_<name>` declarations, computes the word offset
|
--- for `MipsAtom_(name)` and `MipsCode code_<name>` declarations, computes the word offset
|
||||||
--- from each `atom_offset(F, T)` marker to its target `atom_label(T)` declaration, and emits
|
--- from each `atom_offset(F, T)` marker to its target `atom_label(T)` declaration, and emits
|
||||||
--- `gen/offsets.h` with one `#define _atom_offset_F_T = N` per branch.
|
--- `gen/offsets.h` with one `#define _atom_offset_F_T = N` per branch.
|
||||||
|
---
|
||||||
--- Per-directory aggregation: every source in the same directory contributes to the same `gen/offsets.h`.
|
--- Per-directory aggregation: every source in the same directory contributes to the same `gen/offsets.h`.
|
||||||
--- The directory itself is the namespace; the filename does not repeat the module name.
|
--- The directory itself is the namespace; the filename does not repeat the module name.
|
||||||
---
|
---
|
||||||
|
--- (Task 12.16 note: atom-namespaced enum names — e.g., `atom_offset__normalize_v3s4__srav_path__aligned_done` —
|
||||||
|
--- were considered to prevent cross-atom label collisions, but the C-side `atom_offset(F, T)` macro in
|
||||||
|
--- `code/duffle/dsl.atom.h` doesn't know the current atom_name at expansion time, so any namespacing
|
||||||
|
--- on the metaprogram side breaks the C build. Reverted. The C-side would need a per-atom
|
||||||
|
--- `CURRENT_ATOM` #define (set by `MipsAtom_`/`MipsAtom_Proc_` macros) plus an updated `atom_offset`
|
||||||
|
--- macro that uses it. That's a coordinated refactor — deferred to a future track.)
|
||||||
|
---
|
||||||
--- The offset is `target_word - branch_word - 1` (the standard MIPS branch-immediate encoding: branch_offset = relative_pc_in_words - 1).
|
--- The offset is `target_word - branch_word - 1` (the standard MIPS branch-immediate encoding: branch_offset = relative_pc_in_words - 1).
|
||||||
|
|
||||||
-- ════════════════════════════════════════════════════════════════════════════
|
-- ════════════════════════════════════════════════════════════════════════════
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
--- Single source-walk pass that produces the fat `SourceScan` payload consumed by all downstream passes. Walks each corpus source record once,
|
--- Single source-walk pass that produces the fat `SourceScan` payload consumed by all downstream passes. Walks each corpus source record once,
|
||||||
--- extracting every construct type the metaprograms need:
|
--- extracting every construct type the metaprograms need:
|
||||||
--- MipsAtom_ (kind = "atom", with optional atom_info inner)
|
--- MipsAtom_ (kind = "atom", with optional atom_info inner)
|
||||||
|
--- MipsAtom_Proc_ (kind = "atom_proc", body inside last {})
|
||||||
--- MipsAtomComp_ (kind = "comp_bare")
|
--- MipsAtomComp_ (kind = "comp_bare")
|
||||||
--- MipsAtomComp_Proc_ (kind = "comp_proc", body inside last {})
|
--- MipsAtomComp_Proc_ (kind = "comp_proc", body inside last {})
|
||||||
--- atom_dbg_skip — bare whole-atom/component debug-step marker; following declaration disambiguates
|
--- atom_dbg_skip — bare whole-atom/component debug-step marker; following declaration disambiguates
|
||||||
@@ -34,7 +35,7 @@ local parse_enum_int_literal
|
|||||||
-- ════════════════════════════════════════════════════════════════════════════
|
-- ════════════════════════════════════════════════════════════════════════════
|
||||||
|
|
||||||
--- @class SourceScan
|
--- @class SourceScan
|
||||||
--- @field atoms AtomEntry[] -- MipsAtom_ + MipsAtomComp_ + MipsAtomComp_Proc_
|
--- @field atoms AtomEntry[] -- MipsAtom_ + MipsAtom_Proc_ + MipsAtomComp_ + MipsAtomComp_Proc_
|
||||||
--- @field raw_atoms AtomEntry[] -- MipsCode code_<name> { body } (offsets pass only)
|
--- @field raw_atoms AtomEntry[] -- MipsCode code_<name> { body } (offsets pass only)
|
||||||
--- @field binds BindsEntry[] -- typedef Struct_(Binds_X) { fields } (fields pre-parsed)
|
--- @field binds BindsEntry[] -- typedef Struct_(Binds_X) { fields } (fields pre-parsed)
|
||||||
--- @field atom_infos AtomInfoEntry[] -- MipsAtom_(name) atom_info(...) (sub-calls pre-parsed)
|
--- @field atom_infos AtomInfoEntry[] -- MipsAtom_(name) atom_info(...) (sub-calls pre-parsed)
|
||||||
@@ -55,7 +56,7 @@ local parse_enum_int_literal
|
|||||||
--- @field args string|nil -- Trimmed args inside the `(...)` (nil when has_parens is false)
|
--- @field args string|nil -- Trimmed args inside the `(...)` (nil when has_parens is false)
|
||||||
--- @field pending boolean -- true while awaiting the following declaration
|
--- @field pending boolean -- true while awaiting the following declaration
|
||||||
--- @field superseded_by_marker_line integer|nil -- set when a newer marker bumped this one out of the pending slot
|
--- @field superseded_by_marker_line integer|nil -- set when a newer marker bumped this one out of the pending slot
|
||||||
--- @field target_kind string|nil -- "atom" | "comp_bare" | "comp_proc" | "unrelated" once observed (nil if no declaration ever followed)
|
--- @field target_kind string|nil -- "atom" | "atom_proc" | "comp_bare" | "comp_proc" | "unrelated" once observed (nil if no declaration ever followed)
|
||||||
--- @field proc_prelude boolean|nil -- true after the marker crossed an `FI_` prelude and awaits `MipsAtomComp_Proc_`
|
--- @field proc_prelude boolean|nil -- true after the marker crossed an `FI_` prelude and awaits `MipsAtomComp_Proc_`
|
||||||
|
|
||||||
--- @class RegTypeDefault
|
--- @class RegTypeDefault
|
||||||
@@ -111,7 +112,7 @@ local parse_enum_int_literal
|
|||||||
--- @field name string -- Atom name (for components: without ac_ prefix)
|
--- @field name string -- Atom name (for components: without ac_ prefix)
|
||||||
--- @field body string -- Brace-delimited body (without the braces)
|
--- @field body string -- Brace-delimited body (without the braces)
|
||||||
--- @field body_off integer -- Char offset of body[1] in source
|
--- @field body_off integer -- Char offset of body[1] in source
|
||||||
--- @field kind string -- "atom" | "comp_bare" | "comp_proc" | "raw_atom"
|
--- @field kind string -- "atom" | "atom_proc" | "comp_bare" | "comp_proc" | "raw_atom"
|
||||||
--- @field raw_name string -- Un-stripped name (for components: with ac_ prefix)
|
--- @field raw_name string -- Un-stripped name (for components: with ac_ prefix)
|
||||||
--- @field ident_pos integer -- Position of the MipsAtom_/MipsAtomComp_ ident start
|
--- @field ident_pos integer -- Position of the MipsAtom_/MipsAtomComp_ ident start
|
||||||
--- @field after_paren integer -- Position past the closing paren
|
--- @field after_paren integer -- Position past the closing paren
|
||||||
@@ -268,7 +269,7 @@ end
|
|||||||
--- marker_kind == "atom_dbg_skip" AND is_bare == true
|
--- marker_kind == "atom_dbg_skip" AND is_bare == true
|
||||||
--- Any other spelling or shape (parenthesized form, legacy name) is recorded as a raw marker for annotation validation but never stamps `debug_skip`.
|
--- Any other spelling or shape (parenthesized form, legacy name) is recorded as a raw marker for annotation validation but never stamps `debug_skip`.
|
||||||
--- @param out SourceScan
|
--- @param out SourceScan
|
||||||
--- @param target_kind string|nil -- "atom" | "comp_bare" | "comp_proc" | "unrelated" once observed
|
--- @param target_kind string|nil -- "atom" | "atom_proc" | "comp_bare" | "comp_proc" | "unrelated" once observed
|
||||||
--- @return boolean|nil -- true iff the marker is the positive bare form
|
--- @return boolean|nil -- true iff the marker is the positive bare form
|
||||||
local function attach_debug_skip_marker(out, target_kind)
|
local function attach_debug_skip_marker(out, target_kind)
|
||||||
local markers = out.debug_skip_markers
|
local markers = out.debug_skip_markers
|
||||||
@@ -799,6 +800,11 @@ local BYTE_x = 0x78 -- 'x'
|
|||||||
local BYTE_X = 0x58 -- 'X'
|
local BYTE_X = 0x58 -- 'X'
|
||||||
local BYTE_OPEN_BRACE = 0x7B -- '{'
|
local BYTE_OPEN_BRACE = 0x7B -- '{'
|
||||||
local BYTE_CLOSE_BRACE= 0x7D -- '}'
|
local BYTE_CLOSE_BRACE= 0x7D -- '}'
|
||||||
|
local BYTE_SLASH = 0x2F -- '/'
|
||||||
|
local BYTE_STAR = 0x2A -- '*'
|
||||||
|
local BYTE_SPACE = 0x20 -- ' '
|
||||||
|
local BYTE_TAB = 0x09 -- '\t'
|
||||||
|
local BYTE_CR = 0x0D -- '\r'
|
||||||
|
|
||||||
-- Maximum chain depth when resolving `R_*_Code` symbol RHS references.
|
-- Maximum chain depth when resolving `R_*_Code` symbol RHS references.
|
||||||
-- Eight hops is enough for any production chain (R_TapePtr_Code -> R_T8_Code -> ...).
|
-- Eight hops is enough for any production chain (R_TapePtr_Code -> R_T8_Code -> ...).
|
||||||
@@ -822,6 +828,44 @@ local function hex_digit_value(b)
|
|||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Read one trailing C-comment that appears immediately after `pos` in `body`,
|
||||||
|
-- skipping horizontal whitespace and newlines first. Used by `parse_enum_entry` to
|
||||||
|
-- recover the `atom_auto_reg:` / `phase_auto_reg:` scope annotation embedded by
|
||||||
|
-- the `atom_auto_reg` / `phase_auto_reg` macros' RHS expansion
|
||||||
|
-- (`R_<Sym> = R_<Sym>_Code /* atom_auto_reg: <scope> */`).
|
||||||
|
-- Handles both block (`/* ... */`) and line (`// ...`) forms.
|
||||||
|
-- Returns the comment text (without delimiters), or nil if no comment is adjacent.
|
||||||
|
local function read_trailing_cmt_after(body, pos)
|
||||||
|
local body_len = #body
|
||||||
|
while pos <= body_len do
|
||||||
|
local b = body:byte(pos)
|
||||||
|
if b == BYTE_SPACE or b == BYTE_TAB or b == BYTE_NEWLINE or b == BYTE_CR then
|
||||||
|
pos = pos + 1
|
||||||
|
elseif b == BYTE_SLASH then
|
||||||
|
local b2 = body:byte(pos + 1)
|
||||||
|
if b2 == BYTE_STAR then
|
||||||
|
-- Block comment /* ... */
|
||||||
|
local i = pos + 2
|
||||||
|
while i < body_len do
|
||||||
|
if body:byte(i) == BYTE_STAR and body:byte(i + 1) == BYTE_SLASH then
|
||||||
|
return body:sub(pos + 2, i - 1)
|
||||||
|
end
|
||||||
|
i = i + 1
|
||||||
|
end
|
||||||
|
return nil -- unterminated; treat as no comment
|
||||||
|
elseif b2 == BYTE_SLASH then
|
||||||
|
-- Line comment // ... (strip the trailing newline)
|
||||||
|
local end_pos = duffle.find_byte(body, BYTE_NEWLINE, pos + 2) or (body_len + 1)
|
||||||
|
return body:sub(pos + 2, end_pos - 1)
|
||||||
|
end
|
||||||
|
return nil
|
||||||
|
else
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
--- Parse a decimal/negative-decimal/hex integer literal starting at byte position `start`.
|
--- Parse a decimal/negative-decimal/hex integer literal starting at byte position `start`.
|
||||||
--- Returns (value, end_pos) on success, or (nil, start) on failure / no match.
|
--- Returns (value, end_pos) on success, or (nil, start) on failure / no match.
|
||||||
--- Accepts: 12, -1, 0, 0x10, 0X1F, -0x10.
|
--- Accepts: 12, -1, 0, 0x10, 0X1F, -0x10.
|
||||||
@@ -1128,6 +1172,46 @@ local function parse_dbg_skip_marker(source, pos, ident_end, line_of, out)
|
|||||||
return marker_end
|
return marker_end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--- Parse `atom_auto_reg(<atom>, R_<Sym>)` and `phase_auto_reg(<phase>, R_<Sym>)` markers.
|
||||||
|
---
|
||||||
|
--- The macros expand to `sym = sym##_Code` per their definition in dsl.atom.h.
|
||||||
|
--- After preprocessing, the marker renders as a full enum entry of the form `R_<Sym> = R_<Sym>_Code,`.
|
||||||
|
--- This parser detects the macro invocation site, extracts `(scope_name, sym)`, and stores it
|
||||||
|
--- in the per-source table (atom_auto_regs or phase_auto_regs) under the scope's name.
|
||||||
|
---
|
||||||
|
--- @param source string
|
||||||
|
--- @param pos integer
|
||||||
|
--- @param ident_end integer
|
||||||
|
--- @param line_of fun(pos: integer): integer
|
||||||
|
--- @param out SourceScan
|
||||||
|
--- @return integer
|
||||||
|
local function parse_auto_reg_marker(source, pos, ident_end, line_of, out)
|
||||||
|
local marker_kind = source:sub(pos, ident_end - 1) -- "atom_auto_reg" or "phase_auto_reg"
|
||||||
|
local scope_kind = marker_kind == "atom_auto_reg" and "atom" or "phase"
|
||||||
|
|
||||||
|
local inner, after_paren = read_parens_after(source, ident_end)
|
||||||
|
if not inner then return after_paren end
|
||||||
|
|
||||||
|
local args = duffle.split_top_level_commas(inner)
|
||||||
|
local scope_name = args[1] and duffle.trim(args[1]) or nil
|
||||||
|
local sym = args[2] and duffle.trim(args[2]) or nil
|
||||||
|
|
||||||
|
-- Filter: only accept `R_<Sym>` form (matches `^R_[%w_]+$`).
|
||||||
|
if scope_name and sym and sym:match("^R_[%w_]+$") then
|
||||||
|
if scope_kind == "atom" then
|
||||||
|
out.atom_auto_regs = out.atom_auto_regs or {}
|
||||||
|
out.atom_auto_regs[scope_name] = out.atom_auto_regs[scope_name] or {}
|
||||||
|
out.atom_auto_regs[scope_name][sym] = sym
|
||||||
|
else
|
||||||
|
out.phase_auto_regs = out.phase_auto_regs or {}
|
||||||
|
out.phase_auto_regs[scope_name] = out.phase_auto_regs[scope_name] or {}
|
||||||
|
out.phase_auto_regs[scope_name][sym] = sym
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return after_paren
|
||||||
|
end
|
||||||
|
|
||||||
-- Parse `atom_dbg_reg_default(R_X, <type>...)`;
|
-- Parse `atom_dbg_reg_default(R_X, <type>...)`;
|
||||||
-- the second argument may be a `Type` or `Type*`/`Type**` chain. Records in `out.types[R_X]`.
|
-- the second argument may be a `Type` or `Type*`/`Type**` chain. Records in `out.types[R_X]`.
|
||||||
local function parse_atom_dbg_reg_default(source, pos, ident_end, line_of, out)
|
local function parse_atom_dbg_reg_default(source, pos, ident_end, line_of, out)
|
||||||
@@ -1282,6 +1366,49 @@ local function parse_mips_atom_comp_proc(source, pos, ident_end, line_of, out)
|
|||||||
return after_paren
|
return after_paren
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--- Parse: `MipsAtom_Proc_(<name>, <abuilder>, { <body> })` — body is inside the LAST `{` in args.
|
||||||
|
--- Per Task 12.10: full support for the runtime-proc atom form. Registers the atom
|
||||||
|
--- with kind `"atom_proc"` so offsets.lua / components.lua can emit
|
||||||
|
--- * `mac_<name>` aliases in `gen/macs.h` (the components pass)
|
||||||
|
--- * `atom_offset__X__Y` defs in `gen/offsets.h` (the offsets pass)
|
||||||
|
--- The atom name is the FIRST ident of the args (the second arg `ab` is the
|
||||||
|
--- atom-builder, not the name). Unlike `MipsAtomComp_Proc_`, there is no `ac_`
|
||||||
|
--- prefix on the symbol — `MipsAtom_Proc_` is the runtime-proc wrapper, so the
|
||||||
|
--- symbol IS the bare atom name (e.g. `normalize_v3s4`, not `ac_normalize_v3s4`).
|
||||||
|
--- @param source string
|
||||||
|
--- @param pos integer
|
||||||
|
--- @param ident_end integer
|
||||||
|
--- @param line_of fun(pos: integer): integer
|
||||||
|
--- @param out SourceScan
|
||||||
|
--- @return integer
|
||||||
|
local function parse_mips_atom_proc(source, pos, ident_end, line_of, out)
|
||||||
|
local inner, after_paren, open_paren = read_parens_after(source, ident_end)
|
||||||
|
if not inner then return after_paren end
|
||||||
|
|
||||||
|
-- Find the LAST `{` in inner (the body brace, not any potential embedded braces in expressions).
|
||||||
|
local last_brace_pos = nil
|
||||||
|
for search_pos = #inner, 1, -1 do
|
||||||
|
if inner:sub(search_pos, search_pos) == "{" then last_brace_pos = search_pos; break end
|
||||||
|
end
|
||||||
|
if not last_brace_pos then return after_paren end
|
||||||
|
|
||||||
|
-- Use duffle.read_braces to find the matching close brace.
|
||||||
|
-- Uses `read_balanced` for delimiter-depth tracking.
|
||||||
|
-- If close_pos is past the end of inner, the brace didn't match (malformed input); skip.
|
||||||
|
local body, close_pos = duffle.read_braces(inner, last_brace_pos)
|
||||||
|
if close_pos > #inner + 1 then return after_paren end
|
||||||
|
|
||||||
|
-- The atom name is the FIRST ident of the args (matches MipsAtomComp_Proc_'s "first ident" rule).
|
||||||
|
-- MipsAtom_Proc_ has no `ac_` prefix; `strip_ac_prefix` is a no-op for unprefixed names.
|
||||||
|
local raw_name = inner:match("^%s*([%w_]+)") or "?"
|
||||||
|
local name = strip_ac_prefix(raw_name)
|
||||||
|
-- Position of body[1] in source = open_paren + 1 (start of inner) + last_brace_pos + 1 (past '{').
|
||||||
|
local body_off = open_paren + 2 + last_brace_pos
|
||||||
|
register_atom(out, "atom_proc", line_of(pos), name, body, body_off, raw_name, pos, after_paren, source)
|
||||||
|
|
||||||
|
return after_paren
|
||||||
|
end
|
||||||
|
|
||||||
--- Parse: `MipsCode code_<name> { <body> }` (raw atom form — offsets pass only).
|
--- Parse: `MipsCode code_<name> { <body> }` (raw atom form — offsets pass only).
|
||||||
--- @param source string
|
--- @param source string
|
||||||
--- @param pos integer
|
--- @param pos integer
|
||||||
@@ -1602,6 +1729,16 @@ local function parse_enum_entry(source, body, body_offset, line_of, out, entry_n
|
|||||||
local value, value_end = parse_enum_value(body, after_ws, out)
|
local value, value_end = parse_enum_value(body, after_ws, out)
|
||||||
if value == nil then return value_start end
|
if value == nil then return value_start end
|
||||||
|
|
||||||
|
-- Capture the trailing C-comment (if any) before `skip_ws_and_cmt` discards it.
|
||||||
|
-- The `atom_auto_reg(<scope>, <sym>)` macro expands to `R_<Sym> = R_<Sym>_Code /* atom_auto_reg: <scope> */`,
|
||||||
|
-- so the scope name lives in the comment after the RHS value. Routes through `out.atom_entry_comments`
|
||||||
|
-- for downstream `parse_enum` to split into `out.atom_auto_regs` / `out.phase_auto_regs`.
|
||||||
|
local trailing_cmt = read_trailing_cmt_after(body, value_end)
|
||||||
|
if trailing_cmt then
|
||||||
|
out.atom_entry_comments = out.atom_entry_comments or {}
|
||||||
|
out.atom_entry_comments[entry_name] = trailing_cmt
|
||||||
|
end
|
||||||
|
|
||||||
local after_value = duffle.skip_ws_and_cmt(body, value_end)
|
local after_value = duffle.skip_ws_and_cmt(body, value_end)
|
||||||
local has_atom_reg, end_after_atom_reg = check_bare_atom_reg(body, after_value)
|
local has_atom_reg, end_after_atom_reg = check_bare_atom_reg(body, after_value)
|
||||||
|
|
||||||
@@ -1657,6 +1794,14 @@ local function parse_enum_body(source, body, body_offset, line_of, out)
|
|||||||
else
|
else
|
||||||
local entry_name, name_end = duffle.read_ident(body, pos)
|
local entry_name, name_end = duffle.read_ident(body, pos)
|
||||||
if entry_name then
|
if entry_name then
|
||||||
|
-- In-enum `atom_auto_reg(<scope>, R_<Sym>)` / `phase_auto_reg(<scope>, R_<Sym>)` markers:
|
||||||
|
-- the C preprocessor expands them to `R_<Sym> = R_<Sym>_Code /* atom_auto_reg: <scope> */`,
|
||||||
|
-- but the metaprogram reads source-as-written so we must dispatch the parser here too.
|
||||||
|
-- Mirrors the top-level `DECL_PARSERS` entry for `atom_auto_reg` / `phase_auto_reg`.
|
||||||
|
if entry_name == "atom_auto_reg" or entry_name == "phase_auto_reg" then
|
||||||
|
local new_pos = parse_auto_reg_marker(body, pos, name_end, line_of, out)
|
||||||
|
if new_pos > pos then pos = new_pos else pos = name_end end
|
||||||
|
else
|
||||||
local after_name = duffle.skip_ws_and_cmt(body, name_end)
|
local after_name = duffle.skip_ws_and_cmt(body, name_end)
|
||||||
if body:byte(after_name) == BYTE_EQUAL then
|
if body:byte(after_name) == BYTE_EQUAL then
|
||||||
local new_pos = parse_enum_entry(
|
local new_pos = parse_enum_entry(
|
||||||
@@ -1667,6 +1812,7 @@ local function parse_enum_body(source, body, body_offset, line_of, out)
|
|||||||
else
|
else
|
||||||
pos = name_end
|
pos = name_end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
else
|
else
|
||||||
pos = pos + 1
|
pos = pos + 1
|
||||||
end
|
end
|
||||||
@@ -1695,6 +1841,25 @@ local function parse_enum(source, pos, ident_end, line_of, out)
|
|||||||
if not body then return after_brace end
|
if not body then return after_brace end
|
||||||
parse_enum_body(source, body, body_off, line_of, out)
|
parse_enum_body(source, body, body_off, line_of, out)
|
||||||
|
|
||||||
|
-- Route `atom_auto_reg:` / `phase_auto_reg:` markers discovered in trailing C-comments
|
||||||
|
-- into the per-source `atom_auto_regs` / `phase_auto_regs` projections.
|
||||||
|
-- Pattern matches the RHS expansion `R_<Sym> = R_<Sym>_Code /* <kind>_auto_reg: <scope> */`
|
||||||
|
-- emitted by the `atom_auto_reg` / `phase_auto_reg` macros in dsl.atom.h.
|
||||||
|
for entry_name, cmt_text in pairs(out.atom_entry_comments or {}) do
|
||||||
|
local atom_scope = cmt_text:match("atom_auto_reg:%s*([%w_]+)")
|
||||||
|
if atom_scope then
|
||||||
|
out.atom_auto_regs = out.atom_auto_regs or {}
|
||||||
|
out.atom_auto_regs[atom_scope] = out.atom_auto_regs[atom_scope] or {}
|
||||||
|
out.atom_auto_regs[atom_scope][entry_name] = entry_name
|
||||||
|
end
|
||||||
|
local phase_scope = cmt_text:match("phase_auto_reg:%s*([%w_]+)")
|
||||||
|
if phase_scope then
|
||||||
|
out.phase_auto_regs = out.phase_auto_regs or {}
|
||||||
|
out.phase_auto_regs[phase_scope] = out.phase_auto_regs[phase_scope] or {}
|
||||||
|
out.phase_auto_regs[phase_scope][entry_name] = entry_name
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
return after_brace
|
return after_brace
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -1708,12 +1873,18 @@ end
|
|||||||
|
|
||||||
local DECL_PARSERS = {
|
local DECL_PARSERS = {
|
||||||
MipsAtom_ = parse_mips_atom,
|
MipsAtom_ = parse_mips_atom,
|
||||||
|
MipsAtom_Proc_ = parse_mips_atom_proc,
|
||||||
MipsAtomComp_ = parse_mips_atom_comp,
|
MipsAtomComp_ = parse_mips_atom_comp,
|
||||||
MipsAtomComp_Proc_ = parse_mips_atom_comp_proc,
|
MipsAtomComp_Proc_ = parse_mips_atom_comp_proc,
|
||||||
-- `atom_dbg_skip` is the only debug-skip parser entry. Every other
|
-- `atom_dbg_skip` is the only debug-skip parser entry. Every other
|
||||||
-- identifier follows the ordinary unrelated-token path; there is no alias.
|
-- identifier follows the ordinary unrelated-token path; there is no alias.
|
||||||
atom_dbg_skip = parse_dbg_skip_marker,
|
atom_dbg_skip = parse_dbg_skip_marker,
|
||||||
atom_dbg_reg_default = parse_atom_dbg_reg_default,
|
atom_dbg_reg_default = parse_atom_dbg_reg_default,
|
||||||
|
-- `atom_auto_reg(atom, R_<Sym>)` and `phase_auto_reg(phase, R_<Sym>)` populate per-source
|
||||||
|
-- `out.atom_auto_regs` / `out.phase_auto_regs`; the cross-source merge lands in
|
||||||
|
-- `corpus.atom_auto_regs` / `corpus.phase_auto_regs` (first-wins).
|
||||||
|
atom_auto_reg = parse_auto_reg_marker,
|
||||||
|
phase_auto_reg = parse_auto_reg_marker,
|
||||||
MipsCode = parse_mips_code,
|
MipsCode = parse_mips_code,
|
||||||
typedef = parse_typedef_binds,
|
typedef = parse_typedef_binds,
|
||||||
_Pragma = parse_pragma_macro,
|
_Pragma = parse_pragma_macro,
|
||||||
@@ -1748,6 +1919,14 @@ local function scan_source(source, source_file, code_macros, code_macro_bodies)
|
|||||||
debug_skip_markers = {},
|
debug_skip_markers = {},
|
||||||
types = {},
|
types = {},
|
||||||
atom_views = {},
|
atom_views = {},
|
||||||
|
-- Per-source projection for `atom_auto_reg(<atom>, R_<Sym>)` markers.
|
||||||
|
-- Each entry is keyed by atom_name; the inner table maps `R_<Sym>` -> `R_<Sym>` (raw LHS sym).
|
||||||
|
-- Merged cross-source into `corpus.atom_auto_regs` (first-wins).
|
||||||
|
atom_auto_regs = {},
|
||||||
|
-- Per-source projection for `phase_auto_reg(<phase>, R_<Sym>)` markers.
|
||||||
|
-- Each entry is keyed by phase_label; the inner table maps `R_<Sym>` -> `R_<Sym>` (raw LHS sym).
|
||||||
|
-- Merged cross-source into `corpus.phase_auto_regs` (first-wins).
|
||||||
|
phase_auto_regs = {},
|
||||||
line_of = line_of,
|
line_of = line_of,
|
||||||
-- Source-derived register-alias registry (atom_reg opt-in entries).
|
-- Source-derived register-alias registry (atom_reg opt-in entries).
|
||||||
-- Keys are full R_* idents (never stripped); see parse_enum / parse_enum_body.
|
-- Keys are full R_* idents (never stripped); see parse_enum / parse_enum_body.
|
||||||
@@ -1987,6 +2166,8 @@ local function merge_corpus_registries(corpus)
|
|||||||
corpus.atom_ctxs = corpus.atom_ctxs or {}
|
corpus.atom_ctxs = corpus.atom_ctxs or {}
|
||||||
corpus.atom_phases = corpus.atom_phases or {}
|
corpus.atom_phases = corpus.atom_phases or {}
|
||||||
corpus.atom_infos = corpus.atom_infos or {}
|
corpus.atom_infos = corpus.atom_infos or {}
|
||||||
|
corpus.atom_auto_regs = corpus.atom_auto_regs or {}
|
||||||
|
corpus.phase_auto_regs = corpus.phase_auto_regs or {}
|
||||||
corpus.collisions = corpus.collisions or {}
|
corpus.collisions = corpus.collisions or {}
|
||||||
|
|
||||||
-- Replace the existing corpus collections with empty tables so a re-run on the same corpus produces identical state (deterministic merge).
|
-- Replace the existing corpus collections with empty tables so a re-run on the same corpus produces identical state (deterministic merge).
|
||||||
@@ -2030,7 +2211,7 @@ local function merge_corpus_registries(corpus)
|
|||||||
corpus.collisions, "binds", bind_shape)
|
corpus.collisions, "binds", bind_shape)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- atoms_by_name: MipsAtom_(name) + MipsAtomComp_(name) + MipsAtomComp_Proc_(name).
|
-- atoms_by_name: MipsAtom_(name) + MipsAtom_Proc_(name) + MipsAtomComp_(name) + MipsAtomComp_Proc_(name).
|
||||||
-- Each atom carries `{line, name, body, body_off, kind, raw_name, ...}`.
|
-- Each atom carries `{line, name, body, body_off, kind, raw_name, ...}`.
|
||||||
-- Duplicate atom names across sources are first-wins + collision; see the atom_infos block below for the evidence list.
|
-- Duplicate atom names across sources are first-wins + collision; see the atom_infos block below for the evidence list.
|
||||||
for _, atom_entry in ipairs(scan.atoms or {}) do
|
for _, atom_entry in ipairs(scan.atoms or {}) do
|
||||||
@@ -2065,6 +2246,22 @@ local function merge_corpus_registries(corpus)
|
|||||||
corpus.collisions, "phase", phase_shape)
|
corpus.collisions, "phase", phase_shape)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- atom_auto_regs: keyed by atom scope name; each carries a `{R_<Sym> = R_<Sym>}` map.
|
||||||
|
-- Per-source entries are simple inner maps (no body / no shape comparison); first-wins suffices.
|
||||||
|
for atom_scope, syms in pairs(scan.atom_auto_regs or {}) do
|
||||||
|
if corpus.atom_auto_regs[atom_scope] == nil then
|
||||||
|
corpus.atom_auto_regs[atom_scope] = syms
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- phase_auto_regs: keyed by phase label; each carries a `{R_<Sym> = R_<Sym>}` map.
|
||||||
|
-- Per-source entries are simple inner maps (no body / no shape comparison); first-wins suffices.
|
||||||
|
for phase_label, syms in pairs(scan.phase_auto_regs or {}) do
|
||||||
|
if corpus.phase_auto_regs[phase_label] == nil then
|
||||||
|
corpus.phase_auto_regs[phase_label] = syms
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
-- atom_infos: ALWAYS append every record in source/declaration order.
|
-- atom_infos: ALWAYS append every record in source/declaration order.
|
||||||
-- Duplicates are preserved so the annotation pass can flag them via `check_unique_annotation`;
|
-- Duplicates are preserved so the annotation pass can flag them via `check_unique_annotation`;
|
||||||
-- The merge is purely order-preserving.
|
-- The merge is purely order-preserving.
|
||||||
|
|||||||
@@ -39,8 +39,8 @@
|
|||||||
--- `── Info` section renders finding-level info between `── Warnings` and the per-atom cycle counts.
|
--- `── Info` section renders finding-level info between `── Warnings` and the per-atom cycle counts.
|
||||||
---
|
---
|
||||||
--- The structural handshake checks (`mac_yield_uniformity`, `hazard_nop_use`, `control_transfer_delay_slot_use`) skip atoms/components with `debug_skip == true`.
|
--- The structural handshake checks (`mac_yield_uniformity`, `hazard_nop_use`, `control_transfer_delay_slot_use`) skip atoms/components with `debug_skip == true`.
|
||||||
--- The `atom_dbg_skip` marker designates runtime-helper declarations whose structure is fixed by the tape runtime (e.g. `tape_exit`, `ac_yield`).
|
--- `atom_dbg_skip` marker designates runtime-helper declarations whose structure is fixed by the tape runtime (e.g. `tape_exit`, `ac_yield`).
|
||||||
--- Flagging them as "missing mac_yield" or "BD slot is redundant" is signal noise, not a logic failure.
|
--- Flagging them as "missing mac_yield" or "BD slot is redundant".
|
||||||
--- Other checks (transfer_hazards, gpu_portstore_shape, abi_handoff, enum_alias_membership, …) still apply to debug_skip declarations because real hazards / typos can still surface in them.
|
--- Other checks (transfer_hazards, gpu_portstore_shape, abi_handoff, enum_alias_membership, …) still apply to debug_skip declarations because real hazards / typos can still surface in them.
|
||||||
---
|
---
|
||||||
--- The orchestrator (`ps1_meta.lua`) wires this module in via the PASSES table:
|
--- The orchestrator (`ps1_meta.lua`) wires this module in via the PASSES table:
|
||||||
@@ -452,7 +452,7 @@ local function is_cop2_consumer_of(consumer_event, destination, producer_rel)
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- True iff `consumer_event` reads the GPR operand at any position the destination register occupies.
|
-- True iff `consumer_event` reads the GPR operand at any position the destination register occupies.
|
||||||
-- The read-position lookup consults `duffle.OPERAND_READ_POSITIONS` for the consumer's encoder and walks each `args[pos]` to find an operand-equal match.
|
-- read_pos lookup consults `duffle.OPERAND_READ_POSITIONS` for the consumer's encoder and walks each `args[pos]` to find an operand-equal match.
|
||||||
local function is_gpr_consumer_of(consumer_event, destination)
|
local function is_gpr_consumer_of(consumer_event, destination)
|
||||||
local consumer_token = consumer_event.encoder or consumer_event.ident
|
local consumer_token = consumer_event.encoder or consumer_event.ident
|
||||||
local read_pos = duffle.OPERAND_READ_POSITIONS or {}
|
local read_pos = duffle.OPERAND_READ_POSITIONS or {}
|
||||||
@@ -1474,8 +1474,9 @@ end
|
|||||||
local function check_load_delay_slots(atom, pipe_ctx, findings)
|
local function check_load_delay_slots(atom, pipe_ctx, findings)
|
||||||
-- The load-delay check applies to every atom and component body, including debug-skipped components (`ac_*` and `atom_dbg_skip MipsAtom_(...)`).
|
-- The load-delay check applies to every atom and component body, including debug-skipped components (`ac_*` and `atom_dbg_skip MipsAtom_(...)`).
|
||||||
-- The `atom_dbg_skip` marker controls debugger stepping, not instruction safety.
|
-- The `atom_dbg_skip` marker controls debugger stepping, not instruction safety.
|
||||||
|
-- `atom_proc` atoms have full bodies with loads that need delay slots, so the check applies to them too.
|
||||||
local p = atom.paths or {}
|
local p = atom.paths or {}
|
||||||
if atom.kind ~= "atom" then return end
|
if atom.kind ~= "atom" and atom.kind ~= "atom_proc" then return end
|
||||||
local events = p.word_events or {}
|
local events = p.word_events or {}
|
||||||
if #events == 0 then return end
|
if #events == 0 then return end
|
||||||
|
|
||||||
@@ -1579,6 +1580,8 @@ local function check_mac_yield_uniformity(atom, pipe_ctx, findings)
|
|||||||
if is_runtime_helper(atom) then return end
|
if is_runtime_helper(atom) then return end
|
||||||
-- Per-kind semantics:
|
-- Per-kind semantics:
|
||||||
-- MipsAtom_ (baked atom): exactly 1 mac_yield at the end of the body. Control transfer is the atom's job.
|
-- MipsAtom_ (baked atom): exactly 1 mac_yield at the end of the body. Control transfer is the atom's job.
|
||||||
|
-- MipsAtom_Proc_ (runtime-proc atom): exactly 1 mac_yield at the end of the body. Same as baked atom;
|
||||||
|
-- the proc IS the atom; the runtime call to `atombuilder_unroll` doesn't introduce a parent atom.
|
||||||
-- MipsAtomComp_ (bare static-array component): ZERO mac_yield.
|
-- MipsAtomComp_ (bare static-array component): ZERO mac_yield.
|
||||||
-- The component is invoked from inside an atom body; the parent atom does the yield.
|
-- The component is invoked from inside an atom body; the parent atom does the yield.
|
||||||
-- MipsAtomComp_Proc_ (procedural component): ZERO mac_yield.
|
-- MipsAtomComp_Proc_ (procedural component): ZERO mac_yield.
|
||||||
@@ -1602,7 +1605,7 @@ local function check_mac_yield_uniformity(atom, pipe_ctx, findings)
|
|||||||
return atom.line + line_in_body[tokens[idx].rel]
|
return atom.line + line_in_body[tokens[idx].rel]
|
||||||
end
|
end
|
||||||
|
|
||||||
if atom.kind == "atom" then
|
if atom.kind == "atom" or atom.kind == "atom_proc" then
|
||||||
-- Baked atom: exactly 1 yield at the end.
|
-- Baked atom: exactly 1 yield at the end.
|
||||||
if count == 0 then
|
if count == 0 then
|
||||||
findings[#findings + 1] = {
|
findings[#findings + 1] = {
|
||||||
@@ -1647,6 +1650,7 @@ local function check_mac_yield_uniformity(atom, pipe_ctx, findings)
|
|||||||
-- The parent atom does the yield.
|
-- The parent atom does the yield.
|
||||||
-- A yield inside a component would either be dead code (bare) or prematurely terminate the function (proc).
|
-- A yield inside a component would either be dead code (bare) or prematurely terminate the function (proc).
|
||||||
-- Both are bugs.
|
-- Both are bugs.
|
||||||
|
-- `atom_proc` atoms are NOT components; they're runtime-proc atoms that own their own yield (handled in the `if` branch above).
|
||||||
if count > 0 then
|
if count > 0 then
|
||||||
findings[#findings + 1] = {
|
findings[#findings + 1] = {
|
||||||
atom = atom.name,
|
atom = atom.name,
|
||||||
@@ -1678,7 +1682,7 @@ end
|
|||||||
--- Per-atom. Runtime-helper atoms (`debug_skip`) are exempt.
|
--- Per-atom. Runtime-helper atoms (`debug_skip`) are exempt.
|
||||||
--- Takes `(atom, pipe_ctx, findings)`; `pipe_ctx` is unused.
|
--- Takes `(atom, pipe_ctx, findings)`; `pipe_ctx` is unused.
|
||||||
local function check_yield_load_tail_pairing(atom, _pipe_ctx, findings)
|
local function check_yield_load_tail_pairing(atom, _pipe_ctx, findings)
|
||||||
if atom.kind ~= "atom" then return end
|
if atom.kind ~= "atom" and atom.kind ~= "atom_proc" then return end
|
||||||
if is_runtime_helper(atom) then return end
|
if is_runtime_helper(atom) then return end
|
||||||
|
|
||||||
local tokens = atom.paths.tokens
|
local tokens = atom.paths.tokens
|
||||||
@@ -1897,9 +1901,9 @@ end
|
|||||||
--- - Atoms containing a `mac_<name>(...)` call whose `name` is not registered in `pipe_ctx.components_by_name` emit a "new macro;
|
--- - Atoms containing a `mac_<name>(...)` call whose `name` is not registered in `pipe_ctx.components_by_name` emit a "new macro;
|
||||||
--- Not in corpus.components" advisory — the auto-derivation returned nil for that name.
|
--- Not in corpus.components" advisory — the auto-derivation returned nil for that name.
|
||||||
---
|
---
|
||||||
--- Applies only to `kind = "atom"` (baked atoms). Components don't emit full primitives.
|
--- Applies only to `kind = "atom"` or `kind = "atom_proc"` (full-atom bodies). Components don't emit full primitives.
|
||||||
local function check_gpu_portstore_shape(atom, pipe_ctx, findings)
|
local function check_gpu_portstore_shape(atom, pipe_ctx, findings)
|
||||||
if atom.kind ~= "atom" then return end
|
if atom.kind ~= "atom" and atom.kind ~= "atom_proc" then return end
|
||||||
local tokens = atom.paths.tokens
|
local tokens = atom.paths.tokens
|
||||||
local line_in_body = atom.paths.line_in_body
|
local line_in_body = atom.paths.line_in_body
|
||||||
local tc = atom.paths.tok_class
|
local tc = atom.paths.tok_class
|
||||||
|
|||||||
Binary file not shown.
@@ -118,6 +118,12 @@ local PASSES = {
|
|||||||
kind = "header-output",
|
kind = "header-output",
|
||||||
deps = {"scan-source", "word-counts"},
|
deps = {"scan-source", "word-counts"},
|
||||||
},
|
},
|
||||||
|
auto_reg = {
|
||||||
|
module = "passes.auto_reg",
|
||||||
|
kind = "header-output",
|
||||||
|
deps = {"components"},
|
||||||
|
groups = { "pre-link" },
|
||||||
|
},
|
||||||
["emission-model"] = {
|
["emission-model"] = {
|
||||||
module = "passes.emission_model",
|
module = "passes.emission_model",
|
||||||
kind = "validation",
|
kind = "validation",
|
||||||
|
|||||||
Reference in New Issue
Block a user