From 47d605861c3ded9a45062c4fe4d2de8e7daa8f56 Mon Sep 17 00:00:00 2001 From: cgd Date: Sun, 10 Feb 2002 23:11:37 +0000 Subject: [PATCH] 2002-02-10 Chris Demetriou * callback.c: Fix some spelling errors. * hw-device.h: Likewise. * hw-tree.c: Likewise. * sim-abort.c: Likewise. * sim-alu.h: Likewise. * sim-core.h: Likewise. * sim-events.c: Likewise. * sim-events.h: Likewise. * sim-fpu.h: Likewise. * sim-profile.h: Likewise. * sim-utils.c: Likewise. --- sim/common/ChangeLog | 14 ++++++++++++++ sim/common/callback.c | 2 +- sim/common/hw-device.h | 2 +- sim/common/hw-tree.c | 3 ++- sim/common/sim-abort.c | 2 +- sim/common/sim-alu.h | 46 +++++++++++++++++++++++----------------------- sim/common/sim-core.h | 13 +++++++++++-- sim/common/sim-events.c | 6 +++--- sim/common/sim-events.h | 2 +- sim/common/sim-fpu.h | 2 +- sim/common/sim-profile.h | 2 +- sim/common/sim-utils.c | 2 +- 12 files changed, 60 insertions(+), 36 deletions(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 967feb6bcc..8a0bc69aa3 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,17 @@ +2002-02-10 Chris Demetriou + + * callback.c: Fix some spelling errors. + * hw-device.h: Likewise. + * hw-tree.c: Likewise. + * sim-abort.c: Likewise. + * sim-alu.h: Likewise. + * sim-core.h: Likewise. + * sim-events.c: Likewise. + * sim-events.h: Likewise. + * sim-fpu.h: Likewise. + * sim-profile.h: Likewise. + * sim-utils.c: Likewise. + 2002-01-31 Hans-Peter Nilsson * cgen-ops.h (ADDCQI, ADDCFQI, ADDOFQI, SUBCQI, SUBCFQI, SUBOFQI): diff --git a/sim/common/callback.c b/sim/common/callback.c index 19acca0e99..64b4e7cd37 100644 --- a/sim/common/callback.c +++ b/sim/common/callback.c @@ -726,7 +726,7 @@ store (p, size, val, big_p) TS is ignored. The result is the size of the target's stat struct, - or zero if an error occured during the translation. */ + or zero if an error occurred during the translation. */ int cb_host_to_target_stat (cb, hs, ts) diff --git a/sim/common/hw-device.h b/sim/common/hw-device.h index 2cbdc5adc4..bb1568d6c4 100644 --- a/sim/common/hw-device.h +++ b/sim/common/hw-device.h @@ -172,7 +172,7 @@ typedef unsigned (hw_reset_method) node is described as the bus owner and is responisble for co-ordinating bus operations. On the bus, a SPACE:ADDR pair is used to specify an address. A device that is both a bus owner (parent) - and bus client (child) are refered to as a bridging device. + and bus client (child) are referred to as a bridging device. A child performing a data (DMA) transfer will pass its request to the bus owner (the devices parent). The bus owner will then either diff --git a/sim/common/hw-tree.c b/sim/common/hw-tree.c index 1a558351b2..f867bee263 100644 --- a/sim/common/hw-tree.c +++ b/sim/common/hw-tree.c @@ -22,6 +22,7 @@ #include "hw-base.h" #include "hw-tree.h" +#include "sim-io.h" #include "sim-assert.h" #ifdef HAVE_STDLIB_H @@ -680,7 +681,7 @@ parse_string_property (struct hw *current, /* copy it in */ if (*chp == '"') { - /* a quoted string - watch for '\' et.al. */ + /* a quoted string - watch for '\' et al. */ /* estimate the size and allocate space for it */ int pos; chp++; diff --git a/sim/common/sim-abort.c b/sim/common/sim-abort.c index 088bf201a6..014f48b522 100644 --- a/sim/common/sim-abort.c +++ b/sim/common/sim-abort.c @@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc., jump right out of the simulator. It is intended as a holder for simulators that have started to use - sim-core et.al. but are not yet in a position to use sim-engine + sim-core et al. but are not yet in a position to use sim-engine (the setjmp/longjmp code). */ diff --git a/sim/common/sim-alu.h b/sim/common/sim-alu.h index 49d1018527..925fdb81e8 100644 --- a/sim/common/sim-alu.h +++ b/sim/common/sim-alu.h @@ -36,7 +36,7 @@ Code using this module includes it into sim-main.h and then, as a convention, defines macro's ALU*_END that records the result of any - aritmetic performed. Ex: + arithmetic performed. Ex: #include "sim-alu.h" #define ALU32_END(RES) \ @@ -73,7 +73,7 @@ ALU*_RESULT: Generic ALU result output. ALU*_HAD_OVERFLOW: Returns a nonzero value if signed overflow - occured. + occurred. ALU*_OVERFLOW_RESULT: If the macro ALU*_HAD_OVERFLOW is being used this is the most efficient result available. Ex: @@ -84,8 +84,8 @@ (RES) = ALU16_OVERFLOW_RESULT ALU*_HAD_CARRY_BORROW: Returns a nonzero value if unsigned - overflow or underflow (also refered to as carry and borrow) - occured. + overflow or underflow (also referred to as carry and borrow) + occurred. ALU*_CARRY_BORROW_RESULT: If the macro ALU*_HAD_CARRY_BORROW is being used this is the most efficient result available. Ex: @@ -132,7 +132,7 @@ -/* Twos complement aritmetic - addition/subtraction - carry/borrow +/* Twos complement arithmetic - addition/subtraction - carry/borrow (or you thought you knew the answer to 0-0) @@ -154,9 +154,9 @@ UMAXn: The upper bound of an unsigned N bit value (the lower bound is always zero). - Un: UMAXn + 1. Unsigned arrithmetic is computed `modulo (Un)'. + Un: UMAXn + 1. Unsigned arithmetic is computed `modulo (Un)'. - X[p]: Is bit P of X. X[0] denotes the least signifant bit. + X[p]: Is bit P of X. X[0] denotes the least significant bit. ~X[p]: Is the inversion of bit X[p]. Also equal to 1-X[p], (1+X[p])mod(2). @@ -167,7 +167,7 @@ Overflow/Overflow indicates an error in computation of signed - arrithmetic. i.e. given X,Y in [MINn..MAXn]; overflow + arithmetic. i.e. given X,Y in [MINn..MAXn]; overflow indicates that the result X+Y > MAXn or X+Y < MIN_INTx. Hardware traditionally implements overflow by computing the XOR of @@ -179,7 +179,7 @@ Addition - Overflow - method 1: - Overflow occures when the sign (most significant bit) of the two N + Overflow occurs when the sign (most significant bit) of the two N bit operands is identical but different to the sign of the result: Rn = (Xn + Yn) @@ -191,7 +191,7 @@ The two N bit operands are sign extended to M>N bits and then - added. Overflow occures when SIGN_BIT and SIGN_BIT do not + added. Overflow occurs when SIGN_BIT and SIGN_BIT do not match. Rm = (SEXTn (Xn) + SEXTn (Yn)) @@ -203,7 +203,7 @@ The two N bit operands are sign extended to M>N bits and then - added. Overflow occures when the result is outside of the sign + added. Overflow occurs when the result is outside of the sign extended range [MINn .. MAXn]. @@ -235,7 +235,7 @@ Addition - Carry - Introduction: - Carry (poorly named) indicates that an overflow occured for + Carry (poorly named) indicates that an overflow occurred for unsigned N bit addition. i.e. given X, Y in [0..UMAXn] then carry indicates X+Y > UMAXn or X+Y >= Un. @@ -293,7 +293,7 @@ Given two signed N bit numbers, a carry can be detected by treating the numbers as N bit unsigned and adding them using M>N unsigned - arrithmetic. Carry is indicated by bit (1 << N) being set (result + arithmetic. Carry is indicated by bit (1 << N) being set (result >= 2**N). @@ -314,29 +314,29 @@ 0 <= X < Un, 0 <= Y < Un ==> X + Y < 2 Un - Consider Y when carry occures: + Consider Y when carry occurs: X + Y >= Un, Y < Un - ==> (Un - X) <= Y < Un # re-arange + ==> (Un - X) <= Y < Un # rearrange ==> Un <= X + Y < Un + X < 2 Un # add Xn ==> 0 <= (X + Y) mod Un < X mod Un - or when carry as occured: + or when carry as occurred: (X + Y) mod Un < X mod Un - Consider Y when carry does not occure: + Consider Y when carry does not occur: X + Y < Un have X < Un, Y >= 0 ==> X <= X + Y < Un ==> X mod Un <= (X + Y) mod Un - or when carry has not occured: + or when carry has not occurred: ! ( (X + Y) mod Un < X mod Un) - hence we get carry by computing in N bit unsigned arrithmetic. + hence we get carry by computing in N bit unsigned arithmetic. carry <- (Xn + Yn) < Xn @@ -360,7 +360,7 @@ ==> X + ~Y + 1 # -Y = ~Y + 1 In addition to the result, the equation produces Carry-out. For - succeeding extended prrcision calculations, the more general + succeeding extended precision calculations, the more general equation can be used: C[p]:R[p] = X[p] + ~Y[p] + C[p-1] @@ -416,7 +416,7 @@ Treating Xn and Yn as unsigned values then a borrow (unsigned - underflow) occures when: + underflow) occurs when: B = Xn < Yn ==> C = Xn >= Yn @@ -491,7 +491,7 @@ do { \ /* 32 bit target expressions: - Since most hosts do not support 64 (> 32) bit arrithmetic, carry + Since most hosts do not support 64 (> 32) bit arithmetic, carry method 4 and overflow method 4 are used. */ #define ALU32_BEGIN(VAL) \ @@ -518,7 +518,7 @@ alu32_v = 0 /* 64 bit target expressions: Even though the host typically doesn't support native 64 bit - arrithmetic, it is still used. */ + arithmetic, it is still used. */ #define ALU64_BEGIN(VAL) \ unsigned64 alu64_r = (VAL); \ diff --git a/sim/common/sim-core.h b/sim/common/sim-core.h index 7bf15a3b48..771e8a1b54 100644 --- a/sim/common/sim-core.h +++ b/sim/common/sim-core.h @@ -167,7 +167,7 @@ extern void sim_core_detach /* Variable sized read/write Transfer a variable sized block of raw data between the host and - target. Should any problems occure, the number of bytes + target. Should any problems occur, the number of bytes successfully transfered is returned. No host/target byte endian conversion is performed. No xor-endian @@ -213,7 +213,7 @@ extern void sim_core_set_xor /* XOR version of variable sized read/write. Transfer a variable sized block of raw data between the host and - target. Should any problems occure, the number of bytes + target. Should any problems occur, the number of bytes successfully transfered is returned. No host/target byte endian conversion is performed. If applicable @@ -340,4 +340,13 @@ DECLARE_SIM_CORE_READ_N(misaligned,7,8) #undef DECLARE_SIM_CORE_READ_N +#if (WITH_DEVICES) +/* TODO: create sim/common/device.h */ +/* These are defined with each particular cpu. */ +void device_error (device *me, char* message, ...); +int device_io_read_buffer(device *me, void *dest, int space, address_word addr, unsigned nr_bytes, SIM_DESC sd, sim_cpu *processor, sim_cia cia); +int device_io_write_buffer(device *me, const void *source, int space, address_word addr, unsigned nr_bytes, SIM_DESC sd, sim_cpu *processor, sim_cia cia); +#endif + + #endif diff --git a/sim/common/sim-events.c b/sim/common/sim-events.c index 1866b2dccd..22531e3ece 100644 --- a/sim/common/sim-events.c +++ b/sim/common/sim-events.c @@ -37,7 +37,7 @@ #include #endif -#include /* For SIGPROCMASK et.al. */ +#include /* For SIGPROCMASK et al. */ typedef enum { watch_invalid, @@ -112,7 +112,7 @@ struct _sim_event { variables. TIME_OF_EVENT: this holds the time at which the next event is ment - to occure. If no next event it will hold the time of the last + to occur. If no next event it will hold the time of the last event. TIME_FROM_EVENT: The current distance from TIME_OF_EVENT. A value @@ -447,7 +447,7 @@ insert_sim_event (SIM_DESC sd, if (delta < 0) sim_io_error (sd, "what is past is past!\n"); - /* compute when the event should occure */ + /* compute when the event should occur */ time_of_event = sim_events_time (sd) + delta; /* find the queue insertion point - things are time ordered */ diff --git a/sim/common/sim-events.h b/sim/common/sim-events.h index 55b2b740c9..7a0da7b8ca 100644 --- a/sim/common/sim-events.h +++ b/sim/common/sim-events.h @@ -245,7 +245,7 @@ INLINE_SIM_EVENTS\ int slip); -/* Progress time such that an event shall occure upon the next call to +/* Progress time such that an event shall occur upon the next call to sim_events tick */ #if 0 diff --git a/sim/common/sim-fpu.h b/sim/common/sim-fpu.h index 0be3fb1d2d..755e194d1a 100644 --- a/sim/common/sim-fpu.h +++ b/sim/common/sim-fpu.h @@ -321,7 +321,7 @@ INLINE_SIM_FPU (int) sim_fpu_exp (const sim_fpu *s); /* Specific comparison operators - For NaNs et.al., the comparison operators will set IS to zero and + For NaNs et al., the comparison operators will set IS to zero and return a nonzero result. */ INLINE_SIM_FPU (int) sim_fpu_lt (int *is, const sim_fpu *l, const sim_fpu *r); diff --git a/sim/common/sim-profile.h b/sim/common/sim-profile.h index 81fad7d1ca..5936a59b62 100644 --- a/sim/common/sim-profile.h +++ b/sim/common/sim-profile.h @@ -96,7 +96,7 @@ SIM_RC sim_profile_set_option (SIM_DESC sd_, const char *name_, int idx_, #define WITH_PROFILE_CORE_P (WITH_PROFILE & PROFILE_core) /* If MAX_TARGET_MODES isn't defined, we can't do memory profiling. - ??? It is intended that this is a temporary occurence. Normally + ??? It is intended that this is a temporary occurrence. Normally MAX_TARGET_MODES is defined. */ #ifndef MAX_TARGET_MODES #undef WITH_PROFILE_MEMORY_P diff --git a/sim/common/sim-utils.c b/sim/common/sim-utils.c index 6184f1b10e..66b06416ce 100644 --- a/sim/common/sim-utils.c +++ b/sim/common/sim-utils.c @@ -314,7 +314,7 @@ sim_elapsed_time_get () } /* Return the elapsed time in milliseconds since START. - The actual time may be cpu usage (prefered) or wall clock. */ + The actual time may be cpu usage (preferred) or wall clock. */ unsigned long sim_elapsed_time_since (start) -- 2.11.0