Skip to content

Commit

Permalink
Merge pull request #74 from cdm-processors/cocoemu-java
Browse files Browse the repository at this point in the history
Java-based Cocoemu
  • Loading branch information
Intelix8996 authored Oct 28, 2024
2 parents 1ce2eec + 7850163 commit 6dc54a1
Show file tree
Hide file tree
Showing 90 changed files with 2,200 additions and 1,747 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,10 @@ cdm16e_microcode:
# Prepare resources for logisim-cdm-emulator
emulator_resources: microcode
$(CP) $(PROCESSOR_SCHEMES_FOLDER)$(SLASH)cdm16$(SLASH)microcode$(SLASH)cdm16_decoder*.img \
$(JAVA_PROJECTS_FOLDER)$(SLASH)logisim-cdm-emulator$(SLASH)src$(SLASH)main$(SLASH)resources$(SLASH)cdm16
$(CURRENT_DIR)$(SLASH)cocoemu$(SLASH)src$(SLASH)main$(SLASH)resources$(SLASH)cdm16

$(CP) $(PROCESSOR_SCHEMES_FOLDER)$(SLASH)cdm16e$(SLASH)microcode$(SLASH)cdm16e_*.img \
$(JAVA_PROJECTS_FOLDER)$(SLASH)logisim-cdm-emulator$(SLASH)src$(SLASH)main$(SLASH)resources$(SLASH)cdm16e
$(CURRENT_DIR)$(SLASH)cocoemu$(SLASH)src$(SLASH)main$(SLASH)resources$(SLASH)cdm16e

clean: clean_microcode clean_emulator_resources
$(RM) $(BUILD_FOLDER)
Expand Down Expand Up @@ -246,10 +246,10 @@ clean_microcode_cdm16e:

clean_emulator_resources:
$(RM_FILE) \
$(JAVA_PROJECTS_FOLDER)$(SLASH)logisim-cdm-emulator$(SLASH)src$(SLASH)main$(SLASH)resources$(SLASH)cdm16$(SLASH)*.img
$(CURRENT_DIR)$(SLASH)cocoemu$(SLASH)src$(SLASH)main$(SLASH)resources$(SLASH)cdm16$(SLASH)*.img

$(RM_FILE) \
$(JAVA_PROJECTS_FOLDER)$(SLASH)logisim-cdm-emulator$(SLASH)src$(SLASH)main$(SLASH)resources$(SLASH)cdm16e$(SLASH)*.img
$(CURRENT_DIR)$(SLASH)cocoemu$(SLASH)src$(SLASH)main$(SLASH)resources$(SLASH)cdm16e$(SLASH)*.img

# Tests

Expand Down
42 changes: 42 additions & 0 deletions cocoemu/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/

### IntelliJ IDEA ###
.idea/modules.xml
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
*.iws
*.iml
*.ipr
out/
!**/src/main/**/out/
!**/src/test/**/out/

### Eclipse ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/

### VS Code ###
.vscode/

### Mac OS ###
.DS_Store
22 changes: 22 additions & 0 deletions cocoemu/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
plugins {
id 'java'
id "io.freefair.lombok" version "8.6"
}

group = 'org.cdm.emulator'

repositories {
mavenCentral()
}

dependencies {
testImplementation platform('org.junit:junit-bom:5.10.0')
testImplementation 'org.junit.jupiter:junit-jupiter'
}

test {
useJUnitPlatform()
}

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
Loading

0 comments on commit 6dc54a1

Please sign in to comment.