Spec update

replace/247b2c6614ab81925e96744398632e3b7bb8b7ad
Erin 2023-10-22 18:36:32 +02:00
parent cb557d1361
commit fc4118938e
3 changed files with 53 additions and 27 deletions

View File

@ -54,18 +54,18 @@
0x35, ANDI, RRD, "Bitand with immediate" ; 0x35, ANDI, RRD, "Bitand with immediate" ;
0x36, ORI, RRD, "Bitor with immediate" ; 0x36, ORI, RRD, "Bitor with immediate" ;
0x37, XORI, RRD, "Bitxor with immediate" ; 0x37, XORI, RRD, "Bitxor with immediate" ;
0x38, SLUI8, RRW, "Unsigned left bitshift with immedidate (8b)" ; 0x38, SLUI8, RRB, "Unsigned left bitshift with immedidate (8b)" ;
0x39, SLUI16, RRW, "Unsigned left bitshift with immedidate (16b)"; 0x39, SLUI16, RRB, "Unsigned left bitshift with immedidate (16b)";
0x3A, SLUI32, RRW, "Unsigned left bitshift with immedidate (32b)"; 0x3A, SLUI32, RRB, "Unsigned left bitshift with immedidate (32b)";
0x3B, SLUI64, RRW, "Unsigned left bitshift with immedidate (64b)"; 0x3B, SLUI64, RRB, "Unsigned left bitshift with immedidate (64b)";
0x3C, SRUI8, RRW, "Unsigned right bitshift with immediate (8b)" ; 0x3C, SRUI8, RRB, "Unsigned right bitshift with immediate (8b)" ;
0x3D, SRUI16, RRW, "Unsigned right bitshift with immediate (16b)"; 0x3D, SRUI16, RRB, "Unsigned right bitshift with immediate (16b)";
0x3E, SRUI32, RRW, "Unsigned right bitshift with immediate (32b)"; 0x3E, SRUI32, RRB, "Unsigned right bitshift with immediate (32b)";
0x3F, SRUI64, RRW, "Unsigned right bitshift with immediate (64b)"; 0x3F, SRUI64, RRB, "Unsigned right bitshift with immediate (64b)";
0x40, SRSI8, RRW, "Signed right bitshift with immediate" ; 0x40, SRSI8, RRB, "Signed right bitshift with immediate" ;
0x41, SRSI16, RRW, "Signed right bitshift with immediate" ; 0x41, SRSI16, RRB, "Signed right bitshift with immediate" ;
0x42, SRSI32, RRW, "Signed right bitshift with immediate" ; 0x42, SRSI32, RRB, "Signed right bitshift with immediate" ;
0x43, SRSI64, RRW, "Signed right bitshift with immediate" ; 0x43, SRSI64, RRB, "Signed right bitshift with immediate" ;
0x44, CMPUI, RRD, "Unsigned compare with immediate" ; 0x44, CMPUI, RRD, "Unsigned compare with immediate" ;
0x45, CMPSI, RRD, "Signed compare with immediate" ; 0x45, CMPSI, RRD, "Signed compare with immediate" ;
0x46, CP, RR, "Copy register" ; 0x46, CP, RR, "Copy register" ;

View File

@ -85,17 +85,17 @@ where
AND => self.binary_op::<u64>(ops::BitAnd::bitand), AND => self.binary_op::<u64>(ops::BitAnd::bitand),
OR => self.binary_op::<u64>(ops::BitOr::bitor), OR => self.binary_op::<u64>(ops::BitOr::bitor),
XOR => self.binary_op::<u64>(ops::BitXor::bitxor), XOR => self.binary_op::<u64>(ops::BitXor::bitxor),
SLU8 => self.binary_op(|l, r| u8::wrapping_shl(l, r as u32)), SLU8 => self.binary_op::<u8>(ops::Shl::shl),
SLU16 => self.binary_op(|l, r| u16::wrapping_shl(l, r as u32)), SLU16 => self.binary_op::<u16>(ops::Shl::shl),
SLU32 => self.binary_op(u32::wrapping_shl), SLU32 => self.binary_op::<u32>(ops::Shl::shl),
SLU64 => self.binary_op(|l, r| u64::wrapping_shl(l, r as u32)), SLU64 => self.binary_op::<u64>(ops::Shl::shl),
SRU8 => self.binary_op(|l, r| u8::wrapping_shr(l, r as u32)), SRU8 => self.binary_op::<u8>(ops::Shr::shr),
SRU16 => self.binary_op(|l, r| u16::wrapping_shr(l, r as u32)), SRU16 => self.binary_op::<u16>(ops::Shr::shr),
SRU32 => self.binary_op(u32::wrapping_shr), SRU32 => self.binary_op::<u32>(ops::Shr::shr),
SRS8 => self.binary_op(|l: i8, r| i8::wrapping_shl(l, r as u32)), SRS8 => self.binary_op::<u64>(ops::Shr::shr),
SRS16 => self.binary_op(|l: i16, r| i16::wrapping_shl(l, r as u32)), SRS16 => self.binary_op::<i8>(ops::Shr::shr),
SRS32 => self.binary_op(|l: i32, r| i32::wrapping_shl(l, r as u32)), SRS32 => self.binary_op::<i16>(ops::Shr::shr),
SRS64 => self.binary_op(|l: i64, r| i64::wrapping_shl(l, r as u32)), SRS64 => self.binary_op::<i64>(ops::Shr::shr),
CMPU => handler!(self, |OpsRRR(tg, a0, a1)| self.cmp( CMPU => handler!(self, |OpsRRR(tg, a0, a1)| self.cmp(
tg, tg,
a0, a0,
@ -459,8 +459,8 @@ where
/// Perform binary operation over register and shift immediate /// Perform binary operation over register and shift immediate
#[inline(always)] #[inline(always)]
unsafe fn binary_op_ims<T: ValueVariant>(&mut self, op: impl Fn(T, u32) -> T) { unsafe fn binary_op_ims<T: ValueVariant>(&mut self, op: impl Fn(T, u8) -> T) {
let OpsRRW(tg, reg, imm) = self.decode(); let OpsRRB(tg, reg, imm) = self.decode();
self.write_reg(tg, op(self.read_reg(reg).cast::<T>(), imm)); self.write_reg(tg, op(self.read_reg(reg).cast::<T>(), imm));
self.bump_pc::<OpsRRW, true>(); self.bump_pc::<OpsRRW, true>();
} }

30
spec.md
View File

@ -28,10 +28,13 @@
- Xi*n*: Sign-agnostic integer of size *n* bits (Xi8, Xi16, Xi32, Xi64) - Xi*n*: Sign-agnostic integer of size *n* bits (Xi8, Xi16, Xi32, Xi64)
- Fl*n*: Floating point number of size *n* bits (Fl32, Fl64) - Fl*n*: Floating point number of size *n* bits (Fl32, Fl64)
# Behaviours # Behaviour
- Integer operations are always wrapping, including signed numbers - Integer operations are wrapping, including signed numbers
- Bitshifts are truncating
- Two's complement - Two's complement
- Floats as specified by IEEE 754 - Floats as specified by IEEE 754
- Execution model is implementation defined as long all observable
effects are performed in correct order
## Relative addressing ## Relative addressing
Relative addresses are computed from address of the first byte Relative addresses are computed from address of the first byte
@ -51,6 +54,25 @@ of offset in the code. Not from the beginning of current or following instructio
| Towards +∞ (up) | 0b10 | | Towards +∞ (up) | 0b10 |
| Towards -∞ (down) | 0b11 | | Towards -∞ (down) | 0b11 |
- Remaining values in the byte traps with invalid operand exception
# Memory
- Memory implementation is implementation-defined
- Zero address (`0x0`) is considered invalid
# Traps
- Environment call
- Environment breakpoint
Program counter goes to the following instruction
## Exceptions
- Memory access fault
- Invalid operand
- Unknown opcode
Program counter stays on the currently executed instruction
# Instructions # Instructions
- `#n`: register in parameter *n* - `#n`: register in parameter *n*
- `$n`: for immediate in parameter *n* - `$n`: for immediate in parameter *n*
@ -210,6 +232,10 @@ of offset in the code. Not from the beginning of current or following instructio
| 0x36 | ORI | Disjunction (\|) | | 0x36 | ORI | Disjunction (\|) |
| 0x37 | XORI | Non-equivalence (^) | | 0x37 | XORI | Non-equivalence (^) |
# Register-immediate bitshifts
- Type: `RRB`
- Operation: `#0 ← #1 <OP> $2`
## Unsigned left bitshift (`<<`) ## Unsigned left bitshift (`<<`)
| Opcode | Mnemonic | Type | | Opcode | Mnemonic | Type |
|:-------|:---------|:-----| |:-------|:---------|:-----|