romych/Ocean-240.2-Emulator
1
0
Fork 0
mirror of https://github.com/romychs/Ocean-240.2-Emulator.git synced 2026-04-21 11:03:21 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

remove debug freq

Browse Source
This commit is contained in:
Роман Бойков 2026-04-02 15:43:50 +03:00
parent 9d8f413614
commit 16dcc40401
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.go
View File

@ -20,7 +20,6 @@ import (
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"github.com/loov/hrtime" "github.com/loov/hrtime"
"github.com/romychs/z80go/dis" "github.com/romychs/z80go/dis"
log "github.com/sirupsen/logrus"
) )
var Version = "v1.0.2" var Version = "v1.0.2"
@ -115,18 +114,16 @@ func screen(ctx context.Context, computer *okean240.ComputerType, raster *canvas
timeElapsed := hrtime.Since(timeStart) timeElapsed := hrtime.Since(timeStart)
period := float64(timeElapsed.Nanoseconds()) / 1_000_000.0 period := float64(timeElapsed.Nanoseconds()) / 1_000_000.0
//cpuFreq = math.Round(float64(computer.Cycles()-pre)/period) / 1000.0
cpuFreq = math.Round(float64(cpuTicks.Load()-pre)/period) / 1000.0 cpuFreq = math.Round(float64(cpuTicks.Load()-pre)/period) / 1000.0
timerFreq = math.Round(float64(timerTicks.Load()-preTim)/period) / 1000.0 timerFreq = math.Round(float64(timerTicks.Load()-preTim)/period) / 1000.0
adjustPeriods(computer, cpuFreq, timerFreq) adjustPeriods(computer, cpuFreq, timerFreq)
if frame%50 == 0 { if frame%50 == 0 {
label.SetText(formatLabel(computer, cpuFreq, timerFreq, cpuClkPeriod.Load(), timerClkPeriod.Load())) label.SetText(formatLabel(computer, cpuFreq, timerFreq))
log.Debugf("Cpu clk period: %d, Timer clock period: %d, frame time: %1.3fms", cpuClkPeriod.Load(), timerClkPeriod.Load(), period/5.0) //log.Debugf("Cpu clk period: %d, Timer clock period: %d, frame time: %1.3fms", cpuClkPeriod.Load(), timerClkPeriod.Load(), period/5.0)
logger.FlushLogs() //logger.FlushLogs()
} }
//pre = computer.Cycles()
pre = cpuTicks.Load() pre = cpuTicks.Load()
preTim = timerTicks.Load() preTim = timerTicks.Load()
timeStart = hrtime.Now() timeStart = hrtime.Now()
@ -172,9 +169,9 @@ func calcDelta(currentFreq float64, destFreq float64) int64 {
return delta return delta
} }
func formatLabel(computer *okean240.ComputerType, freq float64, freqTim float64, cpu int64, tmr int64) string { func formatLabel(computer *okean240.ComputerType, freq float64, freqTim float64) string {
return fmt.Sprintf("Screen size: %dx%d | Fcpu: %1.3fMHz | Ftmr: %1.3fMHz | Debugger: %s CP:%d TP:%d", return fmt.Sprintf("Screen size: %dx%d | Fcpu: %1.3fMHz | Ftmr: %1.3fMHz | Debugger: %s", // CP:%d TP:%d",
computer.ScreenWidth(), computer.ScreenHeight(), freq, freqTim, computer.DebuggerState(), cpu, tmr) computer.ScreenWidth(), computer.ScreenHeight(), freq, freqTim, computer.DebuggerState())
} }
var timerTicks atomic.Uint64 var timerTicks atomic.Uint64