diff --git a/reSID.cpp b/reSID.cpp index cf3ac8d..f07e9f2 100644 --- a/reSID.cpp +++ b/reSID.cpp @@ -1,4 +1,30 @@ - +/* + Arduino SID + Copyright (c) 2015 Frank Bösing + This library is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this library. If not, see . + The helix decoder itself as a different license, look at the subdirectories for more info. + Diese Bibliothek ist freie Software: Sie können es unter den Bedingungen + der GNU General Public License, wie von der Free Software Foundation, + Version 3 der Lizenz oder (nach Ihrer Wahl) jeder neueren + veröffentlichten Version, weiterverbreiten und/oder modifizieren. + Diese Bibliothek wird in der Hoffnung, dass es nützlich sein wird, aber + OHNE JEDE GEWÄHRLEISTUNG, bereitgestellt; sogar ohne die implizite + Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÃœR EINEN BESTIMMTEN ZWECK. + Siehe die GNU General Public License für weitere Details. + Sie sollten eine Kopie der GNU General Public License zusammen mit diesem + Programm erhalten haben. Wenn nicht, siehe . + Der Helixdecoder selbst hat eine eigene Lizenz, bitte für mehr Informationen + in den Unterverzeichnissen nachsehen. + */ #include "reSID.h" #include diff --git a/reSID.h b/reSID.h index 3593add..7d28faa 100644 --- a/reSID.h +++ b/reSID.h @@ -1,4 +1,30 @@ - +/* + Arduino SID + Copyright (c) 2015 Frank Bösing + This library is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this library. If not, see . + The helix decoder itself as a different license, look at the subdirectories for more info. + Diese Bibliothek ist freie Software: Sie können es unter den Bedingungen + der GNU General Public License, wie von der Free Software Foundation, + Version 3 der Lizenz oder (nach Ihrer Wahl) jeder neueren + veröffentlichten Version, weiterverbreiten und/oder modifizieren. + Diese Bibliothek wird in der Hoffnung, dass es nützlich sein wird, aber + OHNE JEDE GEWÄHRLEISTUNG, bereitgestellt; sogar ohne die implizite + Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÃœR EINEN BESTIMMTEN ZWECK. + Siehe die GNU General Public License für weitere Details. + Sie sollten eine Kopie der GNU General Public License zusammen mit diesem + Programm erhalten haben. Wenn nicht, siehe . + Der Helixdecoder selbst hat eine eigene Lizenz, bitte für mehr Informationen + in den Unterverzeichnissen nachsehen. + */ #include "sid.h" #ifndef play_sid_h_ diff --git a/reSID/AUTHORS b/reSID/AUTHORS new file mode 100644 index 0000000..d22e33d --- /dev/null +++ b/reSID/AUTHORS @@ -0,0 +1,3 @@ +Authors of reSID. + +Dag Lem: Designed and programmed complete emulation engine. diff --git a/reSID/COPYING b/reSID/COPYING new file mode 100644 index 0000000..d60c31a --- /dev/null +++ b/reSID/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/reSID/ChangeLog b/reSID/ChangeLog new file mode 100644 index 0000000..1c7aa47 --- /dev/null +++ b/reSID/ChangeLog @@ -0,0 +1,313 @@ +2004-06-11 Dag Lem + + * Version 0.16 released. + + * envelope.h (EnvelopeGenerator::clock): Corrected off-by-one + error in check for ADSR delay bug in delta_t cycle interface. + + * filter.cc (Filter::set_chip_model): Initialize filter cutoff + mappings before call to set_chip_model. + + * sid.cc (SID::set_sampling_parameters): Build shifted FIR tables + with samples according to the sampling frequency. + (SID::clock_resample_interpolate): New function; factorized linear + interpolation out from filter convolutions, and made convolutions + vectorizable. + (SID::clock_resample_fast): New function; single convolution, same + accuracy as with interpolation by using more filter tables. + (SID::State, SID::read_state, SID::write_state): Read and write + rate_counter_period and exponential_counter_period. Read sustain + value. + +2003-10-20 Dag Lem + + * Version 0.15 released. + + * envelope.h (EnvelopeGenerator): Added public State enum. + (EnvelopeGenerator::clock): Rate counter is 15 bits, count + rate_period - 1 after wrapping from 0x8000 to 0 in ADSR delay bug. + + * sid.cc, sid.h (SID::State): Added envelope_state. + (SID::State::write_state): Restore register 0x18. + (SID::set_sampling_parameters): Scale resampling filter to avoid + clipping. + (SID::clock_resample): Saturated arithmetics to avoid clipping. + +2002-12-31 Dag Lem + + * Version 0.14 released. + + * envelope.h (EnvelopeGenerator::clock): Corrected one cycle error + in ADSR delay bug. Only load the exponential counter period at the + envelope counter values 255, 93, 54, 26, 14, 6, 0. + + * filter.cc (Filter::set_chip_model): Call set_w0() and set_Q() to + update filter settings. + (Filter::set_w0): Limit cutoff frequency for both 1 cycle and + delta_t cycle filter. + + * filter.h (Filter::clock): Mix in external audio input. + + * sid.cc, sid.h (SID::input): New function; accepts external audio + input sample. + + * spline.h (PointPlotter::operator ()): Clamp negative values to + zero. + + * voice.cc, voice.h: Changed misleading name wave_DC to wave_zero. + + * wave.h (WaveformGenerator::clock): Corrected bug in check for + accumulator bit 19 in noise register shift. + +2002-01-19 Dag Lem + + * Version 0.13 released. + + * configure.in: Replaced AC_TRY_COMPILER with AC_TRY_COMPILE, + removed AC_PROG_RANLIB. + + * envelope.h (EnvelopeGenerator::clock): Reset rate_step on state + change. + + * extfilt.cc (ExternalFilter::set_chip_model): New calculation of + maximum mixer DC level. + + * filter.cc (Filter::set_chip_model): Moved calculation of + voice_DC to voice.cc, corrected calculation of mixer_DC. + + * filter.h (Filter::output): Mixer output is not inverted. + + * sid.cc (SID::set_chip_model): Call voice.set_chip_model instead + of voice.wave.set_chip_model. + + * voice.cc (Voice::Voice): Call set_chip_model. + (Voice::set_chip_model): New function; model both waveform D/A + converter and envelope multiplying D/A converter DC offsets. + + * voice.h (Voice::output): Add both waveform D/A converter and + envelope multiplying D/A converter DC offsets. + + * wave.h (WaveformGenerator::output____): Reverted to output + minimum wave level when no waveform is selected. The maximum and + minimum wave output levels are interchanged in C= Hacking Issue #20. + +2001-10-20 Dag Lem + + * Version 0.12 released. + + * envelope.cc, envelope.h, filter.cc, filter.h, wave.cc, wave.h: + Removed bool usage. This avoids unnecessary conversion to 1/0. + + * filter.cc (Filter::set_chip_model): New function; selects voice + and mixer DC offsets and mapping from the FC registers to filter + cutoff frequency. The voice and mixer DC offsets for the MOS6581 are + calculated from measurements made by Hársfalvi, Levente in + C= Hacking Issue #20. + (Filter::Filter): Call set_chip_model. + (Filter::f0_6581, Filter::f0_8580): Separate FC mapping tables. + (Filter::f0_points_6581, Filter::f0_points_8580): Separate FC mapping + points. + + * extfilt.cc, extfilt.h (ExternalFilter::set_chip_model): New + function supporting separate DC correction for MOS6581 and MOS8580. + + * sid.cc, sid.h (SID::adjust_sampling_frequency): New function for + on-the-fly adjustment of sampling frequency. + (SID::clock_fast): Corrected sample calculation. + (SID::set_chip_model): Set filter chip model. + (SID::output): Added audio clipping. + (SID::clock, SID::clock_fast, SID::clock_interpolate, + SID::clock_resample): Added sample interleaving. + + * spline.h (interpolate): Generalized to accept repeated points to + introduce points of non-differentiability and discontinuity. + + * wave.h (WaveformGenerator::output____): No selected waveform + yields maximum wave output level. This was found by Hársfalvi, + Levente in C= Hacking Issue #20. + (WaveformGenerator::clock): Optimized for speed (no division). + +2001-03-10 Dag Lem + + * Version 0.11 released. + + * configure.in: Disable building of shared library by default. + Control inlining with RESID_INLINING (0 or 1) and RESID_INLINE + (blank or "inline"). + + * envelope.h, extfilt.h, filter.h, voice.h, wave.h: inline keyword + in both function declarations and function definitions. + + * samp2src.pl: Beautified Perl code. + + * sid.h, sid.cc: Replaced voice variables with array. Removed + filter variables from SID::State. + (SID::clock): New audio sample generating interface. Three + clocking methods are available; clocking at output sample + frequency, clocking at cycle frequency with linear sample + interpolation, and clocking at cycle frequency with audio + resampling. + (SID::clock_fast, SID::clock_interpolate, SID::clock_resample): + New functions called by SID::clock. + (SID::set_sampling_parameters): New function to set up SID for + sample generation. The FIR table used in SID::clock_resample is + calculated here. + (SID::I0): 0th order modified Bessel function to calculate Kaiser + window. + + * siddefs.h: Control inlining with RESID_INLINING (0 or 1) and + RESID_INLINE (blank or "inline"). Added enum sampling_method. + + * voice.h, voice.cc (Voice::set_sync_source): Moved setting of + sync source from constructor. + + * wave.h, wave.cc (WaveformGenerator::set_sync_source): Moved + setting of sync source from constructor. + +2000-11-22 Dag Lem + + * Version 0.10 released. + + * configure.in, Makefile.am: Use libtool to build library. The + hack to "disable" install is removed. + + * extfilt.h, filter.h: Moved filter stability code from sid.cc. + + * sid.cc (SID::clock): Moved filter stability code to + extfilt.h/filter.h. Don't clock the rest of the chip more + frequently than necessary. + + * wave.cc: Typecast for pedantic (and probably incorrect) + compilers. + +2000-05-18 Dag Lem + + * Version 0.9 released. + + * filter.h (Filter::output): The sum of the filter outputs is no + longer weighted. + +1999-06-24 Dag Lem + + * Version 0.8 released. + + * filter.h, filter.cc, wave.h, wave.cc: Typecasts for pedantic + compilers. + + * filter.h (Filter::clock): Voice 3 is only silenced by voice3off + if it is not routed through the filter. + + * sid.cc (SID::State): Added constructor for proper initalization. + + * spline.h: Inlined template functions to avoid problems at link + time with certain compilers. + +1999-02-25 Dag Lem + + * Version 0.7 released. + + * configure.in: Check whether compiler supports bool. + + * extfilt.h, extfilt.cc: Implementation of C64 filter, external to + the SID chip. + + * filter.h (Filter::clock): Optimized filter routing using a switch. + (Filter::output): Optimized filter mixing using a switch, avoiding + integer division. Corrected sign of filtered output, which is + inverted compared to unfiltered output. + + * filter.cc (Filter::set_w0): Removed use of M_PI and math.h + functions. Use spline table to map fc to w0. + (Filter::fc_default): Return array of FC spline interpolation points. + (Filter::fc_plotter): Return FC spline plotter object. + + * sid.h (SID::enable_external_filter): Enable/disable external + filter. + (SID::fc_default): Return array of FC spline interpolation points. + (SID::fc_plotter): Return FC spline plotter object. + (SID::State, SID::read_state, SID::write_state): Read and write + complete SID state. + + * sid.cc (SID::clock): Age bus value. Clock external filter. + (SID::enable_external_filter): Enable/disable external filter. + + * spline.h: Spline implementation. Used to specify mapping from + the FC register to filter cutoff frequency. + +1998-11-14 Dag Lem + + * Version 0.6 released. + + * configure.in: Allow compilation in a separate directory. + + * wave.h (WaveformGenerator::synchronize): Handle special case when a + sync source is synced itself on the same cycle as its MSB is set + high. + + * sid.cc (SID::clock): Only clock on MSB on/off for hard sync. + +1998-09-06 Dag Lem + + * Version 0.5 released. + + * version.cc (resid_version_string): Version string with C linkage. + + * wave.cc (WaveformGenerator::set_chip_model): Emulation of MOS8580 + combined waveforms. + +1998-08-28 Dag Lem + + * Version 0.4 released. + + * envelope.h (EnvelopeGenerator::clock): Count up to rate_period twice + during ADSR delay bug, and add one extra rate counter step. + + * filter.cc (Filter::bsd_copysign): Renamed copysign function for + compilation on platforms where copysign is implemented as a macro. + +1998-08-23 Dag Lem + + * Version 0.3 released. + + * envelope.h (EnvelopeGenerator::clock): Handle ADSR boundary bug. + + * envelope.cc (EnvelopeGenerator::rate_counter_period, + EnvelopeGenerator::exponential_counter_period): Corrected counter + periods. + + * filter.h (Filter::clock): Optimized for speed (division by shifting). + + * sid.h (SID::clock): New one-cycle optimized overload of the clock() + function. + + * wave.h (WaveformGenerator::output_P_T): Combined waveform + pulse+triangle indexing corrected. + (WaveformGenerator::output_P__): Check for test bit to handle + pulse+test bit samples. + (WaveformGenerator::output): Optimized for speed (inlining). + +1998-07-28 Dag Lem + + * Version 0.2 released. + + * envelope.h (EnvelopeGenerator::clock): Start decay cycle immediately + at envelope counter 0xff. New sustain value is zero if the sustain + level is raised above the current envelope counter value. + (EnvelopeGenerator::step_envelope): Handle ADSR delay bug. + + * envelope.cc (EnvelopeGenerator::rate_counter_period, + EnvelopeGenerator::exponential_counter_period): Corrected counter + periods. + (EnvelopeGenerator::writeCONTROL_REG): Do not modify rate counter. + + * filter.cc (Filter::set_Q): Constrain Q to keep filter stable. + + * sid.h (SID::read, SID::write, SID::bypass_filter): Simplified API + routing register access through the SID class. + + * sid.cc (SID::output): Corrected variable-bit audio output return. + (SID::read, SID::write): Allow read of write only registers. + +1998-06-09 Dag Lem + + * Version 0.1 released. diff --git a/reSID/INSTALL b/reSID/INSTALL new file mode 100644 index 0000000..54caf7c --- /dev/null +++ b/reSID/INSTALL @@ -0,0 +1,229 @@ +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software +Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + These are generic installation instructions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. + + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. + +Installation Names +================== + + By default, `make install' will install the package's files in +`/usr/local/bin', `/usr/local/man', etc. You can specify an +installation prefix other than `/usr/local' by giving `configure' the +option `--prefix=PATH'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +give `configure' the option `--exec-prefix=PATH', the package will use +PATH as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=PATH' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the `--target=TYPE' option to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +will cause the specified gcc to be used as the C compiler (unless it is +overridden in the site shell script). + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/reSID/NEWS b/reSID/NEWS new file mode 100644 index 0000000..e0ff298 --- /dev/null +++ b/reSID/NEWS @@ -0,0 +1,271 @@ +Changes in reSID version 0.16 +----------------------------- + +An off-by-one error in the emulation of the ADSR delay bug has been +fixed in the fast version of the envelope clocking. + +An initialization bug in the Filter class which caused floating point +exceptions on some platforms has been fixed. + +Missing fields have been added to SID::State for correct snapshots. + +By building shifted FIR tables with samples according to the sampling +frequency, the resampling code dramatically reduces the computational +effort in the filter convolutions, without any loss of accuracy. The +filter convolutions are now also vectorizable on current hardware. The +implementation builds on ideas by Laurent Ganier. + +The resampling code has been split into two functions, one using +interpolation and a small set of shifted filter tables, and one using +direct lookup and a large set of shifted filter tables. The accuracy +is the same, the difference is that the direct lookup runs has the +potential of running at almost twice the speed (depending on cache +size and memory bandwidth) using approximately 16MB more memory. It is +now possible to run high quality resampling in real time on quite +modest hardware, provided that a vectorizing compiler is used. + + +Changes in reSID version 0.15 +----------------------------- + +An error in the emulation of the ADSR delay bug has been fixed. When +emulation of the ADSR delay bug was introduced in reSID 0.2, the delay +was one cycle too long. One cycle was subtracted from the delay in +reSID 0.4, however unfortunately one rate counter period was added as +well, thus increasing the error. At the time there was no method to +fully synchronize the CPU with envelope 3, so the measurements relied +on averaging. Because of pipelining in the envelope logic the effects +of a write are delayed, and this caused the test code to miss the +target by exactly one rate counter period on a real SID. The current +test code does achieve full synchronization with envelope 3, so this +time the delay should be 100% correct. There are still side effects +caused by pipelining which are not implemented in reSID, however these +effects are not controllable without full synchronization with the +envelope, something which is hard to achieve with envelope 3, and +impossible with envelope 1 and 2. + +The envelope state (ADSR) has been added to the SID state, and the +volume setting is now restored from the SID state. + +Filter scaling and clipping has been added to avoid sample overflows +in the resampling filter. + + +Changes in reSID version 0.14 +----------------------------- + +The SID external audio input is now emulated. This can be used e.g. to +simulate the hack of connecting a resistor from EXT IN to GND to boost +the sample volume on the MOS8580. Calling sid.input(-32768) makes the +MOS8580 sound more or less like the MOS6581 with respect to samples. +The interface could also be used to mix in an external audio signal, +but note that to do this correctly you should really resample the +audio signal to 1MHz first. + +The filter settings are now updated immediately when the chip model is +changed. Earlier the filter cutoff frequency would not change until +the FC registers were updated. + +A one cycle error in the fast version of the envelope clocking has +been fixed. This bug was introduced in reSID 0.13 and could affect the +ADSR delay emulation. + +The exponential counter period is now only loaded at the envelope +counter values 255, 93, 54, 26, 14, 6, 0. The period can be different +for the same envelope counter value, depending on whether the envelope +has been rising (attack -> release) or sinking (decay/release). + +A bug in the fast version of the noise register shift routine has been +corrected. This bug caused too low noise frequency in some cases. + +The filter cutoff frequency is limited to 16kHz to keep the filter stable. + + +Changes in reSID version 0.13 +----------------------------- + +The internal DC levels of the MOS6581 have been double checked and +corrected. The reason for the asymmetric scaling of the voice output +has been found; there is a DC offset from the waveform D/A converter +in addition to the DC offset from the envelope multiplying D/A +converter. No selected waveform (N=P=S=T=0) yields minimum wave output +level again. + +A bug in the fast version of the envelope clocking has been corrected. +This bug could incorrectly invoke the ADSR delay emulation. + + +Changes in reSID version 0.12 +----------------------------- + +A bug causing incorrect sample spacing in the new SAMPLE_FAST sample +calculation has been corrected. + +Audio clipping has been added to guard against sample overflows. + +To support multi-channel sampling, sample interleaving has been added +to the clock() interface. + +To support synchronization with an external timer, an interface for +sample rate adjustment has been added. + +The internal DC levels have been corrected. No selected waveform +(N=P=S=T=0) yields maximum wave output level. Furthermore, each voice +in the MOS6581 independently contributes to the DC level in the mixer, +and the mixer itself has a small DC offset as well. The MOS8580 has no +DC offsets. + +The spline interpolation routine has been generalized to accept +repeated points to introduce points of non-differentiability and +discontinuity. + +A separate mapping from the FC registers to filter cutoff frequency +has been included for the MOS8580, and the mapping for the MOS6581 has +been refined. + + +Changes in reSID version 0.11 +----------------------------- + +A new clock() interface has been added. This function generates audio +samples into a buffer, greatly simplifying the task of writing driver +code for reSID. It also facilitates more advanced audio sample +generation, as described below. + +Three clocking methods are available: clocking at output sample +frequency, clocking at cycle frequency with linear sample +interpolation, and clocking at cycle frequency with audio resampling. + +Clocking at output sample frequency is fast, and yields acceptable +sound quality, except for the SID combined waveforms, which have a +very high frequency content. + +Clocking at cycle frequency with linear sample interpolation is +approximately five to ten times slower at 44.1kHz sampling frequency, +but the sound quality is improved because of the linear sample +interpolation, and because some sampling noise is removed by the SID +external filter, which attenuates signals above 16kHz. + +Finally, clocking at cycle frequency with audio resampling has a work +rate which is independent of the sampling frequency; it is rather +inversely proportional to the percentage of the bandwidth allocated +to the filter transition band. This implies that e.g. with the +transition band starting at ~ 20kHz, it is faster to generate 48kHz +than 44.1kHz samples. + +Audio resampling is the theoretically correct method for sample +generation, and delivers SID sound quality previously unheard of. This +should make connoisseurs nod in appreciation, and for some time to +come it could possibly also make people tear their hair over having to +buy state of the art hardware to handle the obscene workload in real +time. By trading off passband bandwidth for speed, real time +processing is possible on current hardware. A 60% passband bandwidth +is within the reach of reasonably fast machines, while maximum sound +quality at 90% passband bandwidth, requiring four times the processing +power, is not. Yet. + + +Changes in reSID version 0.10 +----------------------------- + +Libtool is now used to build the library. + +To keep the filters stable it is necessary to clock them at above +sample rate. The chip clocking code has been modified to only +"overclock" the filters, not the whole chip. This yields a +considerable speedup without noticeably lowering sound quality. Note +that this is aimed at slow hardware, if possible the 1 cycle clock +interface should be used to eliminate sampling noise. + + +Changes in reSID version 0.9 +---------------------------- + +The sum of the filter outputs is no longer weighted. + + +Changes in reSID version 0.8 +---------------------------- + +voice3off has no effect if voice 3 is routed through the filter. + + +Changes in reSID version 0.7 +---------------------------- + +The audio output filter in the C64, external to the SID chip, has been +modeled. + +The mapping function between the FC register and filter cutoff frequency can +now be specified with spline interpolation points. This facilitates +interactive modification of the mapping function by graphical presentation of +the interpolation curve. The implementation of this novel spline design is +fast and general purpose, and should be well suited for use in other projects +as well. + +Filtered output has been inverted compared to unfiltered output. + +Aging of the bus value obtained when reading write only registers has been +partly implemented. + +To facilitate offline storage the complete state of SID can be read and +written. + + +Changes in reSID version 0.6 +---------------------------- + +A special case in synchronization has been implemented. + +The Autoconf script is cleaned up to allow compilation in a separate directory. + + +Changes in reSID version 0.5 +---------------------------- + +Emulation of MOS8580 combined waveforms. + +Version string resid_version_string provided for e.g. Autoconf tests. +The string has C linkage. + + +Changes in reSID version 0.4 +---------------------------- + +The implementation of the ADSR delay bug has been refined and should now be +cycle exact. + +The patch for VICE has been removed since VICE 0.15 will include reSID support. + + +Changes in reSID version 0.3 +---------------------------- + +The reSID library has changed name from libmos6581.a to libresid.a + +The pulse+sawtooth combined waveform has been corrected. + +Pulse+test bit samples are implemented. + +The envelope rate periods have finally been exactly determined. + +A new SID bug, the ADSR boundary bug, has been discovered and implemented. +This bug makes it possible to step from envelope level 0x00 to 0xff or from +0xff to 0x00 in one step. + +One-cycle optimized overloads of the clock() functions have been implemented +to facilitate sampling at 1MHz. + +The code has been further optimized for speed. + + +Changes in reSID version 0.2 +---------------------------- + +The implementation of the Envelope Generator has been rewritten to handle +the infamous ADSR delay bug. All known envelope related bugs have been +corrected. + +The maximum filter resonance is lowered to keep the filter stable. + +The reSID API has been simplified. Reading write only registers is allowed. diff --git a/reSID/README b/reSID/README new file mode 100644 index 0000000..79da519 --- /dev/null +++ b/reSID/README @@ -0,0 +1,26 @@ +This is reSID, a reverse engineered software emulation of the MOS6581 SID +(Sound Interface Device). This chip was used in the Commodore 64 computer. + +reSID is free software. See the file COPYING for copying permission. + +reSID is a C++ library containing a complete emulation of the SID chip. +This library can be linked into programs emulating the MOS6510 MPU to +play music made for the Commodore 64 computer. reSID has been successfully +linked into VICE, a full-fledged Commodore 64 emulator, and SIDPLAY, a +popular SID tune player. The VICE home page is: +http://www.viceteam.org/ +A patch for SIDPLAY can be found on the SIDPLAY home page: +http://www.geocities.com/SiliconValley/Lakes/5147/ + +Various SID emulators exist, however reSID should still be of great +interest to Commodore 64 nostalgics. The emulator engine is cycle-based, +emulating the internal operations of the SID chip. SID's audio filter is +modeled as an actual two-integrator-loop biquadratic filter circuit. +The engine has been developed based on available information on SID, sampling +of the OSC3 and ENV3 registers, filter theory, and meticulous testing. +In short, a scientific approach has been taken to model the SID chip as +accurately as possible. + +To our knowledge reSID is by far the most accurate SID emulator ever created. +This comes at a price; what is considered a fairly fast CPU at the time of +this writing is needed to run the emulator. diff --git a/reSID/THANKS b/reSID/THANKS new file mode 100644 index 0000000..824c682 --- /dev/null +++ b/reSID/THANKS @@ -0,0 +1,87 @@ +reSID was written by Dag Lem. + +The project was started after reading an interview with Bob Yannes, the +head engineer of the SID chip. This interview was made by Andreas Varga, +with additional questions from Linus Walleij. The interview can be found on +the SID Homepage: +http://stud1.tuwien.ac.at/~e9426444/sidpage.html +The reverse engineering of the SID chip would not have been possible without +this interview. + +Also found on the SID Homepage is an examination of the SID noise waveform +written by Asger Alstrup. This article was of great help in reverse +engineering the complete algorithm for the noise waveform. + +Lars Haugseth has been invaluable in the testing of reSID. +In a matter of hours after hearing about my project, he had completed a 6510 +disassembler in Perl. The importance of this was not evident to me until the +next day when he had disassembled the music routine for "Outrun Remix" by +Geir Tjelta, made some changes to it, reassembled, and produced a file +containing 48K of SID register values. +The first tests of reSID were run on this file. +With an exceptional memory of Commodore 64 tunes Lars Haugseth has pointed +out several errors in reSID that are now corrected. + +Morten Rollan and Kåre Gunnar Nesheim have provided interesting and insightful +information regarding digital filters. Kåre Gunnar Nesheim has also kindly +provided a 1901 monitor and a C64C from his private computer museum. His C64C +was used to measure the MOS8580 filter cutoff characteristics. + +VICE has been an inspiration for this project, and testing of reSID has +been greatly simplified by VICEs -sounddev dump option. Teemu Rantanen +has written support for reSID in VICE, making it possible to choose at runtime +between his excellent SID emulation and, given enough CPU power, the reSID +emulator engine. Tibor Biczo, Andreas Boose, and André Fachat have provided +combined waveform samples for 6581 R1, R3, R4, and 8580 R5 SID chips. +The VICE home page is found at: +http://www.viceteam.org/ + +The author of SIDPLAY, Michael Schwendt, has implemented a patch to link +libsidplay with reSID. Using his excellent tune player he has pointed out +several bugs in reSID. He has also provided invaluable information related to +the bugs as basis for further investigation. Most notably, the infamous ADSR +delay bug, of which I was previously unaware, has finally been understood and +is now correctly implemented in reSID. The SIDPLAY home page is found at: +http://www.geocities.com/SiliconValley/Lakes/5147/ + +A bug report from Daniel Lacasse led to the discovery of a previously unknown +SID bug, the ADSR boundary bug. + +Anders Ødegård has explained aspects of analog electronics and audio +equipment. + +Bob Yannes has patiently answered questions and has provided lots of +technical information on the SID filter. Thank you Bob! + +Julius O. Smith III has provided much of the theoretical basis for the +audio resampling with his "Digital Audio Resampling Home Page": +http://www-ccrma.stanford.edu/~jos/resample/ + +Hársfalvi, Levente has made a thorough investigation of the DC levels +in the MOS6581 chip. His results are available in C= Hacking Issue #20, +and form the basis of DC corrections in reSID. Levente found that each +voice independently contributes to the DC level in the mixer. Note +that some of the conclusions in the article are incorrect, as the +maximum and minimum voice output levels are interchanged. + +The author of SIDPLAY2, Simon White, has given a lot of feedback on +reSID. Most importantly he found and fixed a bug in the fast clock +version of the ADSR emulation. + +Laurent Ovaert found and fixed a bug in the fast version of the noise +register shift routine. + +Andreas Dehmel has reported all sorts of initialization and overflow +errors. + +Laurent Ganier demonstrated two crucial techniques for vectorizable +filter convolution in a patch. Firstly, he made the filter elements +correspond to the sampling frequency, allowing the linear +interpolation to be factorized out from the convolution. Secondly, he +duplicated elements in the sample ring buffer, achieving contiguous +storage of the samples. The current resampling implementation builds +on these ideas, improving on them by using shifted filter tables for +generalization and accuracy. + +Finally I would like to thank my business partner Stian W. Arnesen for +putting up with all this nonsense. diff --git a/reSID/TODO b/reSID/TODO new file mode 100644 index 0000000..4527dfa --- /dev/null +++ b/reSID/TODO @@ -0,0 +1,8 @@ +* Determine the characteristics of the SID filter integrators. Spice + may perhaps be used to simulate the filter circuit. + +* Write documentation. Possibly a paper describing how SID was reverse + engineered. + +* Implement a SID tune player. A PSID player, VSID, is partly + implemented in VICE. diff --git a/reSID/filter.cc b/reSID/filter.cc index 54fc2da..6a33635 100644 --- a/reSID/filter.cc +++ b/reSID/filter.cc @@ -228,7 +228,7 @@ void Filter::writeFC_LO(reg8 fc_lo) void Filter::writeFC_HI(reg8 fc_hi) { - fc = ((fc_hi << 3) & 0x7f8) | (fc & 0x007); + fc = (((unsigned int)fc_hi << 3) & 0x7f8) | (fc & 0x007); set_w0(); } diff --git a/reSID/wave.cc b/reSID/wave.cc index 9d9bd05..4b72467 100644 --- a/reSID/wave.cc +++ b/reSID/wave.cc @@ -76,7 +76,7 @@ void WaveformGenerator::writeFREQ_LO(reg8 freq_lo) void WaveformGenerator::writeFREQ_HI(reg8 freq_hi) { - freq = ((freq_hi << 8) & 0xff00) | (freq & 0x00ff); + freq = (((unsigned int) freq_hi << 8) & 0xff00) | (freq & 0x00ff); } void WaveformGenerator::writePW_LO(reg8 pw_lo) @@ -86,7 +86,7 @@ void WaveformGenerator::writePW_LO(reg8 pw_lo) void WaveformGenerator::writePW_HI(reg8 pw_hi) { - pw = ((pw_hi << 8) & 0xf00) | (pw & 0x0ff); + pw = (((unsigned int)pw_hi << 8) & 0xf00) | (pw & 0x0ff); } void WaveformGenerator::writeCONTROL_REG(reg8 control) diff --git a/sid.cpp b/sid.cpp index f0c9f8f..db10806 100644 --- a/sid.cpp +++ b/sid.cpp @@ -1,5 +1,30 @@ - - +/* + Arduino SID + Copyright (c) 2015 Frank Bösing + This library is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this library. If not, see . + The helix decoder itself as a different license, look at the subdirectories for more info. + Diese Bibliothek ist freie Software: Sie können es unter den Bedingungen + der GNU General Public License, wie von der Free Software Foundation, + Version 3 der Lizenz oder (nach Ihrer Wahl) jeder neueren + veröffentlichten Version, weiterverbreiten und/oder modifizieren. + Diese Bibliothek wird in der Hoffnung, dass es nützlich sein wird, aber + OHNE JEDE GEWÄHRLEISTUNG, bereitgestellt; sogar ohne die implizite + Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÃœR EINEN BESTIMMTEN ZWECK. + Siehe die GNU General Public License für weitere Details. + Sie sollten eine Kopie der GNU General Public License zusammen mit diesem + Programm erhalten haben. Wenn nicht, siehe . + Der Helixdecoder selbst hat eine eigene Lizenz, bitte für mehr Informationen + in den Unterverzeichnissen nachsehen. + */ #include "reSID/envelope.cc" #include "reSID/extfilt.cc" diff --git a/sid.h b/sid.h index 0608c1b..9d017c2 100644 --- a/sid.h +++ b/sid.h @@ -1,4 +1,30 @@ - +/* + Arduino SID + Copyright (c) 2015 Frank Bösing + This library is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this library. If not, see . + The helix decoder itself as a different license, look at the subdirectories for more info. + Diese Bibliothek ist freie Software: Sie können es unter den Bedingungen + der GNU General Public License, wie von der Free Software Foundation, + Version 3 der Lizenz oder (nach Ihrer Wahl) jeder neueren + veröffentlichten Version, weiterverbreiten und/oder modifizieren. + Diese Bibliothek wird in der Hoffnung, dass es nützlich sein wird, aber + OHNE JEDE GEWÄHRLEISTUNG, bereitgestellt; sogar ohne die implizite + Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÃœR EINEN BESTIMMTEN ZWECK. + Siehe die GNU General Public License für weitere Details. + Sie sollten eine Kopie der GNU General Public License zusammen mit diesem + Programm erhalten haben. Wenn nicht, siehe . + Der Helixdecoder selbst hat eine eigene Lizenz, bitte für mehr Informationen + in den Unterverzeichnissen nachsehen. + */ #include "reSID/sid.h"