Skip to content

Commit

Permalink
Cleanup: Renamed VIC20 to VIC2
Browse files Browse the repository at this point in the history 
VIC20 is a computer, the chip is called VIC-II
  • Loading branch information
@jeroenbakker-atmind
jeroenbakker-atmind committed Feb 14, 2025
1 parent c53a8b9 commit 8f9b413
Show file tree
Hide file tree
Showing 11 changed files with 126 additions and 126 deletions.
4 changes: 2 additions & 2 deletions c64-assembler-macro/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ pub fn application(input: TokenStream) -> TokenStream {
lines.push(line.join(""));
}
}
if name == "include_vic20_defines" {
lines.push(" .include_vic20_defines()".to_string());
if name == "include_vic2_defines" {
lines.push(" .include_vic2_defines()".to_string());
}
if name == "include_sid_defines" {
lines.push(" .include_sid_defines()".to_string());
Expand Down
4 changes: 2 additions & 2 deletions c64-assembler/examples/black_border_d64.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ use cbm::Petscii;
fn main() -> AssemblerResult<()> {
let application = application!(
name="Set black border"
include_vic20_defines
include_vic2_defines
module!(
name="main"
instructions!(
include_basic_header
main_entry_point:
"Load black color into accumulator"
lda #$00
sta VIC20_BORDER_COLOR
sta VIC2_BORDER_COLOR
rts
)
)
Expand Down
4 changes: 2 additions & 2 deletions c64-assembler/examples/black_border_dasm.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use c64_assembler::validator::AssemblerResult;
fn main() -> AssemblerResult<()> {
let application = ApplicationBuilder::default()
.name("Set black border")
.include_vic20_defines()
.include_vic2_defines()
.module(
ModuleBuilder::default()
.name("main")
Expand All @@ -18,7 +18,7 @@ fn main() -> AssemblerResult<()> {
.label("main_entry_point")
.lda_imm(0x00)
.comment("Load black color")
.sta_addr("VIC20_BORDER_COLOR")
.sta_addr("VIC2_BORDER_COLOR")
.rts()
.build(),
)
Expand Down
4 changes: 2 additions & 2 deletions c64-assembler/examples/black_border_macro.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ use c64_assembler_macro::application;
fn main() -> AssemblerResult<()> {
let application = application!(
name="Set black border"
include_vic20_defines
include_vic2_defines
module!(
name="main"
instructions!(
include_basic_header
main_entry_point:
"Load black color into accumulator"
lda #$00
sta VIC20_BORDER_COLOR
sta VIC2_BORDER_COLOR
rts
)
)
Expand Down
4 changes: 2 additions & 2 deletions c64-assembler/examples/black_border_program.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use c64_assembler::validator::AssemblerResult;
fn main() -> AssemblerResult<()> {
let application = ApplicationBuilder::default()
.name("Set black border")
.include_vic20_defines()
.include_vic2_defines()
.module(
ModuleBuilder::default()
.name("main")
Expand All @@ -18,7 +18,7 @@ fn main() -> AssemblerResult<()> {
.label("main_entry_point")
.lda_imm(0x00)
.comment("Load black color")
.sta_addr("VIC20_BORDER_COLOR")
.sta_addr("VIC2_BORDER_COLOR")
.rts()
.build(),
)
Expand Down
206 changes: 103 additions & 103 deletions c64-assembler/src/builder/application.rs
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion c64-assembler/src/builder/instruction.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use crate::{
/// let instructions = InstructionBuilder::default()
/// .label("main_entry_point")
/// .lda_imm(0x00)
/// .sta_addr("VIC20_BORDER_COLOR")
/// .sta_addr("VIC2_BORDER_COLOR")
/// .rts()
/// .build();
/// ```
Expand Down
12 changes: 6 additions & 6 deletions c64-assembler/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
//!
//! let application = ApplicationBuilder::default()
//! .name("Set black border")
//! .include_vic20_defines()
//! .include_vic2_defines()
//! .module(
//! ModuleBuilder::default()
//! .name("main")
Expand All @@ -41,7 +41,7 @@
//! .label("main_entry_point")
//! .lda_imm(0x00)
//! .comment("Load black color")
//! .sta_addr("VIC20_BORDER_COLOR")
//! .sta_addr("VIC2_BORDER_COLOR")
//! .rts()
//! .build(),
//! )
Expand Down Expand Up @@ -86,7 +86,7 @@
//!
//! processor 6502
//!
//! VIC20_BORDER_COLOR = $D020
//! VIC2_BORDER_COLOR = $D020
//!
//! org $0800
//!
Expand All @@ -98,7 +98,7 @@
//!
//! main_entry_point:
//! lda #$00
//! sta VIC20_BORDER_COLOR
//! sta VIC2_BORDER_COLOR
//! rts
//! ; --- Module end: MAIN ---
//! ```
Expand Down Expand Up @@ -132,15 +132,15 @@
//!
//! let application = application!(
//! name="Set black border"
//! include_vic20_defines
//! include_vic2_defines
//! module!(
//! name="main"
//! instructions!(
//! include_basic_header
//! main_entry_point:
//! "Load black color into accumulator"
//! lda #$00
//! sta VIC20_BORDER_COLOR
//! sta VIC2_BORDER_COLOR
//! rts
//! )
//! )
Expand Down
4 changes: 2 additions & 2 deletions c64-assembler/src/test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use crate::{
fn test_application() -> AssemblerResult<Application> {
ApplicationBuilder::default()
.name("test build dasm")
.include_vic20_defines()
.include_vic2_defines()
.module(
ModuleBuilder::default()
.name("main")
Expand All @@ -18,7 +18,7 @@ fn test_application() -> AssemblerResult<Application> {
.label("main_entry_point")
.lda_imm(0x00)
.comment("Load black color")
.sta_addr("VIC20_BORDER_COLOR")
.sta_addr("VIC2_BORDER_COLOR")
.rts()
.build(),
)
Expand Down
4 changes: 2 additions & 2 deletions c64-assembler/src/validator/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
//!
//! let application = application!(
//! name="Set black border"
//! include_vic20_defines
//! include_vic2_defines
//! module!(
//! name="main"
//! instructions!(
//! include_basic_header
//! main_entry_point:
//! "Load black color into accumulator"
//! lda #$00
//! sta VIC20_BORDER_COLOR
//! sta VIC2_BORDER_COLOR
//! rts
//! )
//! )
Expand Down
4 changes: 2 additions & 2 deletions c64-assembler/tests/black_border_roundtrip.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ use mos6502::{
fn set_black_border() -> AssemblerResult<()> {
let application = application!(
name="Set black border"
include_vic20_defines
include_vic2_defines
module!(
name="main"
instructions!(
main_entry_point:
"Load black color into accumulator"
lda #$00
sta VIC20_BORDER_COLOR
sta VIC2_BORDER_COLOR
rts
)
)
Expand Down

0 comments on commit 8f9b413

Please sign in to comment.