Browse Source

Change logic when gating ports on locked operators

master
cancel 6 years ago
parent
commit
2361cef2cb
  1. 14
      sim.c

14
sim.c

@ -260,12 +260,9 @@ Usz usz_clamp(Usz val, Usz min, Usz max) {
#define OPER_PORT_FLIP_LOCK_BIT(_flags) ((_flags) ^ Mark_flag_lock) #define OPER_PORT_FLIP_LOCK_BIT(_flags) ((_flags) ^ Mark_flag_lock)
#define PORT(_delta_y, _delta_x, _flags) \ #define PORT(_delta_y, _delta_x, _flags) \
mbuffer_poke_relative_flags_or( \ if (Oper_ports_enabled && !(cell_flags & OPER_PORT_CELL_ENABLING_MASK)) \
mbuffer, height, width, y, x, _delta_y, _delta_x, \ mbuffer_poke_relative_flags_or(mbuffer, height, width, y, x, _delta_y, \
((_flags)&OPER_PORT_IO_MASK) | \ _delta_x, OPER_PORT_FLIP_LOCK_BIT(_flags))
(Oper_ports_enabled && !(cell_flags & OPER_PORT_CELL_ENABLING_MASK) \
? OPER_PORT_FLIP_LOCK_BIT(_flags) \
: Mark_flag_none))
#define END_PORTS } #define END_PORTS }
#define OPER_MOVE_OR_EXPLODE(_delta_y, _delta_x) \ #define OPER_MOVE_OR_EXPLODE(_delta_y, _delta_x) \
@ -737,7 +734,10 @@ static Isz const uturn_data[] = {
// clang-format on // clang-format on
}; };
enum { Uturn_per = 3, Uturn_loop_limit = Uturn_per * 4, }; enum {
Uturn_per = 3,
Uturn_loop_limit = Uturn_per * 4,
};
BEGIN_DUAL_PHASE_0(uturn) BEGIN_DUAL_PHASE_0(uturn)
REALIZE_DUAL; REALIZE_DUAL;

Loading…
Cancel
Save