Skip to content

Fix "&&" operation #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 6, 2024
Merged

Fix "&&" operation #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/arm-codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ void update_elf_offset(ph2_ir_t *ph2_ir)
case OP_bit_or:
case OP_bit_xor:
case OP_negate:
case OP_log_and:
case OP_bit_not:
elf_offset += 4;
return;
Expand Down Expand Up @@ -119,6 +118,9 @@ void update_elf_offset(ph2_ir_t *ph2_ir)
case OP_return:
elf_offset += 24;
return;
case OP_log_and:
elf_offset += 28;
return;
default:
printf("Unknown opcode\n");
abort();
Expand Down Expand Up @@ -439,8 +441,14 @@ void emit_ph2_ir(ph2_ir_t *ph2_ir)
emit(__mov_i(__EQ, rd, 1));
return;
case OP_log_and:
/* FIXME: bad logical-and instruction */
emit(__and_r(__AL, rd, rn, rm));
/* TODO: short-circuit evaluation */
emit(__teq(rn));
emit(__mov_i(__NE, __r8, 1));
emit(__mov_i(__EQ, __r8, 0));
emit(__teq(rm));
emit(__mov_i(__NE, rd, 1));
emit(__mov_i(__EQ, rd, 0));
emit(__and_r(__AL, rd, rd, __r8));
return;
case OP_log_or:
emit(__or_r(__AL, rd, rn, rm));
Expand Down
11 changes: 8 additions & 3 deletions src/riscv-codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ void update_elf_offset(ph2_ir_t *ph2_ir)
case OP_bit_or:
case OP_bit_xor:
case OP_negate:
case OP_log_and:
case OP_bit_not:
elf_offset += 4;
return;
Expand Down Expand Up @@ -90,6 +89,7 @@ void update_elf_offset(ph2_ir_t *ph2_ir)
case OP_branch:
elf_offset += 20;
return;
case OP_log_and:
case OP_return:
elf_offset += 24;
return;
Expand Down Expand Up @@ -413,8 +413,13 @@ void emit_ph2_ir(ph2_ir_t *ph2_ir)
emit(__xori(rd, rd, 1));
return;
case OP_log_and:
/* FIXME: bad logical-and instruction */
emit(__and(rd, rs1, rs2));
/* TODO: short-circuit evaluation */
emit(__xor(__t0, rs1, rs2));
emit(__sub(rd, __t0, rs1));
emit(__sub(__t0, __t0, rs2));
emit(__sltu(rd, __zero, rd));
emit(__sltu(__t0, __zero, __t0));
emit(__and(rd, rd, __t0));
return;
case OP_log_or:
emit(__or(rd, rs1, rs2));
Expand Down