openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r2323 - in cpu/arm: mmp2 olpc/1.75
by repository service 01 Jul '11

01 Jul '11

Author: wmb Date: Fri Jul 1 20:45:24 2011 New Revision: 2323 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2323 Log: OLPC XO-1.75 - use the EC for rebooting instead of the watchdog timer. That lets the EC clean up its state too, which helps with the SPI command protocol synchronization. Modified: cpu/arm/mmp2/watchdog.fth cpu/arm/olpc/1.75/devices.fth Modified: cpu/arm/mmp2/watchdog.fth ============================================================================== --- cpu/arm/mmp2/watchdog.fth Thu Jun 30 10:34:11 2011 (r2322) +++ cpu/arm/mmp2/watchdog.fth Fri Jul 1 20:45:24 2011 (r2323) @@ -14,18 +14,13 @@ (wdt!) ; : wdt@ ( offset -- value ) wdt-pa + l@ ; -: (reset-all) ( -- ) +: wdt-reset ( -- ) enable-wdt-clock 2 h# 68 wdt! \ set match register 3 h# 64 wdt! \ match enable: just interrupt, no reset yet 1 h# 98 wdt! \ Reset counter begin again ; -' (reset-all) to reset-all - -stand-init: - ['] reset-all to bye -; 0 [if] : test-wdt ( -- ) Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Thu Jun 30 10:34:11 2011 (r2322) +++ cpu/arm/olpc/1.75/devices.fth Fri Jul 1 20:45:24 2011 (r2323) @@ -104,13 +104,6 @@ fload ${BP}/cpu/arm/mmp2/irq.fth fload ${BP}/cpu/arm/mmp2/watchdog.fth \ reset-all using watchdog timer -: olpc-reset-all ( -- ) - " screen" " dcon-off" ['] execute-device-method catch if - 2drop 2drop - then - (reset-all) -; -' olpc-reset-all to reset-all 0 0 " d4018000" " /" begin-package \ UART3 fload ${BP}/cpu/arm/mmp2/uart.fth @@ -168,6 +161,18 @@ : stand-power-off ( -- ) ec-power-off begin wfi again ; ' stand-power-off to power-off +: olpc-reset-all ( -- ) + " screen" " dcon-off" ['] execute-device-method catch if + 2drop 2drop + then + ec-power-cycle + begin wfi again +; +' olpc-reset-all to reset-all +stand-init: + ['] reset-all to bye +; + fload ${BP}/dev/olpc/kb3700/batstat.fth \ Battery status reports fload ${BP}/cpu/arm/olpc/1.75/boardrev.fth \ Board revision decoding

1 0

[commit] r2322 - cpu/arm/olpc/1.75
by repository service 30 Jun '11

30 Jun '11

Author: wmb Date: Thu Jun 30 10:34:11 2011 New Revision: 2322 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2322 Log: Q4B00 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Thu Jun 30 10:33:16 2011 (r2321) +++ cpu/arm/olpc/1.75/fw-version.fth Thu Jun 30 10:34:11 2011 (r2322) @@ -1,3 +1,6 @@ \ The overall firmware revision -macro: FW_MAJOR A -macro: FW_MINOR 16 +macro: FW_MAJOR B +macro: FW_MINOR 00 + + +

1 0

[commit] r2321 - cpu/arm
by repository service 30 Jun '11

30 Jun '11

Author: wmb Date: Thu Jun 30 10:33:16 2011 New Revision: 2321 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2321 Log: ARM - support direct loading of Linux ELF images that are not wrapped in zImage decompression code. Modified: cpu/arm/linux.fth Modified: cpu/arm/linux.fth ============================================================================== --- cpu/arm/linux.fth Thu Jun 30 10:24:40 2011 (r2320) +++ cpu/arm/linux.fth Thu Jun 30 10:33:16 2011 (r2321) @@ -185,6 +185,18 @@ : mcr ( -- ) cr exit? throw ; +\ Hack to force the vaddr to a paddr, because the Linux kernel expects to be +\ started at physical addresses. +: (linux-elf-map-in) ( va size -- ) + drop ( va ) + h# c000.0000 u> if ( ) + p32_vaddr h# c000.0000 - dup elf32-pheader >p32_vaddr l! ( pa ) + to linux-base + true to linux-loaded? + then +; +' (linux-elf-map-in) to elf-map-in + \ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks \

1 0

[commit] r2320 - dev
by repository service 30 Jun '11

30 Jun '11

Author: wmb Date: Thu Jun 30 10:24:40 2011 New Revision: 2320 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2320 Log: This goes with the last checkin - added locking around kbd-reset so it will work when the alarm handler is enabled. Modified: dev/pckbd.fth Modified: dev/pckbd.fth ============================================================================== --- dev/pckbd.fth Thu Jun 30 10:22:57 2011 (r2319) +++ dev/pckbd.fth Thu Jun 30 10:24:40 2011 (r2320) @@ -193,9 +193,11 @@ : toggle-leds ( led-mask -- ) led-state xor set-leds ; : kbd-reset ( -- failed-reset? ) + lock \ Send kbd reset command h# ff cmd get-data h# aa <> + unlock ; : do-esc ( char -- ESC )

1 0

[commit] r2319 - cpu/arm/olpc/1.75 cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev/olpc/keyboard dev/olpc/touchpad
by repository service 30 Jun '11

30 Jun '11

Author: wmb Date: Thu Jun 30 10:22:57 2011 New Revision: 2319 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2319 Log: OLPC - added touchpad and keyboard tests to /ap-sp (SP-mediated) keyboard and touchpad drivers. Also auto-created keyboard and mouse aliases depending on which interface has an attached keyboard on XO-1.75. Modified: cpu/arm/olpc/1.75/fw.bth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/via/fw.bth dev/olpc/keyboard/selftest.fth dev/olpc/touchpad/syntpad.fth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Jun 28 21:37:49 2011 (r2318) +++ cpu/arm/olpc/1.75/fw.bth Thu Jun 30 10:22:57 2011 (r2319) @@ -209,8 +209,18 @@ fload ${BP}/dev/logdev.fth fload ${BP}/cpu/x86/pc/olpc/disptest.fth +dev /ec-spi/keyboard fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic +device-end +dev /ap-sp/keyboard +fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic +device-end +dev /ec-spi/mouse +fload ${BP}/dev/olpc/touchpad/syntpad.fth \ Touchpad diagnostic +device-end +dev /ap-sp/mouse fload ${BP}/dev/olpc/touchpad/syntpad.fth \ Touchpad diagnostic +device-end fload ${BP}/cpu/x86/pc/olpc/gridmap.fth \ Gridded display tools fload ${BP}/cpu/x86/pc/olpc/via/copynand.fth fload ${BP}/cpu/arm/olpc/1.75/exc7200-touchscreen.fth \ Touchscreen driver and diagnostic @@ -318,15 +328,25 @@ fload ${BP}/dev/hdaudio/noiseburst.fth \ audio-test support package -0 value sp-kbd-ih +: select-keyboard ( -- ) + " /ap-sp/keyboard" open-dev ?dup 0= if exit then >r ( r: ih ) + " kbd-reset" r@ $call-method ( failed? ) + 0= if + " keyboard" " /ap-sp/keyboard" $devalias + " mouse" " /ap-sp/mouse" $devalias + else + " keyboard" " /ec-spi/keyboard" $devalias + " mouse" " /ec-spi/mouse" $devalias + then + r> close-dev +; + : console-start ( -- ) + select-keyboard install-mux-io cursor-off true to text-on? - " /ap-sp/keyboard" open-dev to sp-kbd-ih - sp-kbd-ih if sp-kbd-ih add-input then - " //null" open-dev to null-ih \ For text-off state ; : keyboard-off ( -- ) @@ -335,11 +355,6 @@ keyboard-ih close-dev 0 to keyboard-ih then - sp-kbd-ih if - sp-kbd-ih remove-input - sp-kbd-ih close-dev - 0 to sp-kbd-ih - then ; : interpreter-init ( -- ) hex @@ -405,13 +420,14 @@ read-game-keys - ?update-ec-flash - factory-test? if text-off then " probe-" do-drop-in show-child + + ?update-ec-flash + install-alarm ['] sound catch drop Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Tue Jun 28 21:37:49 2011 (r2318) +++ cpu/x86/pc/olpc/fw.bth Thu Jun 30 10:22:57 2011 (r2319) @@ -336,7 +336,9 @@ fload ${BP}/cpu/x86/pc/olpc/help.fth fload ${BP}/cpu/x86/pc/olpc/gui.fth fload ${BP}/cpu/x86/pc/olpc/suspend.fth \ Suspend/resume setup +dev /keyboard fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic +device-end fload ${BP}/dev/olpc/touchpad/touchpad.fth \ Touchpad diagnostic fload ${BP}/cpu/x86/pc/olpc/gridmap.fth \ Gridded display tools fload ${BP}/cpu/x86/pc/olpc/copynand.fth Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Tue Jun 28 21:37:49 2011 (r2318) +++ cpu/x86/pc/olpc/via/fw.bth Thu Jun 30 10:22:57 2011 (r2319) @@ -373,7 +373,9 @@ fload ${BP}/dev/logdev.fth fload ${BP}/cpu/x86/pc/olpc/disptest.fth +dev /keyboard fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic +device-end fload ${BP}/dev/olpc/touchpad/touchpad.fth \ Touchpad diagnostic fload ${BP}/cpu/x86/pc/olpc/gridmap.fth \ Gridded display tools fload ${BP}/cpu/x86/pc/olpc/via/copynand.fth Modified: dev/olpc/keyboard/selftest.fth ============================================================================== --- dev/olpc/keyboard/selftest.fth Tue Jun 28 21:37:49 2011 (r2318) +++ dev/olpc/keyboard/selftest.fth Thu Jun 30 10:22:57 2011 (r2319) @@ -4,7 +4,7 @@ \needs final-test? 0 value final-test? \needs smt-test? 0 value smt-test? -dev /keyboard +\ Must be loaded in the keyboard device node hex \ This is 1 for the original rubber keyboard and 2 for the mechanical keyboard @@ -767,8 +767,6 @@ ; warning ! -device-end - \ LICENSE_BEGIN \ Copyright (c) 2007 FirmWorks \ Modified: dev/olpc/touchpad/syntpad.fth ============================================================================== --- dev/olpc/touchpad/syntpad.fth Tue Jun 28 21:37:49 2011 (r2318) +++ dev/olpc/touchpad/syntpad.fth Thu Jun 30 10:22:57 2011 (r2319) @@ -1,6 +1,5 @@ \ See license at end of file \ Add this code to the existing mouse driver -dev /mouse h# f800 constant red h# 07e0 constant green @@ -244,10 +243,6 @@ final-test? if selftest-failed? else false then ; -\ We are finished adding code to the mouse driver. -\ Go back to the main forth context -device-end - \ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks \

1 0

[commit] r2318 - cpu/x86/pc/olpc/via
by repository service 28 Jun '11

28 Jun '11

Author: wmb Date: Tue Jun 28 21:37:49 2011 New Revision: 2318 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2318 Log: Q3B13 Modified: cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Tue Jun 28 21:32:22 2011 (r2317) +++ cpu/x86/pc/olpc/via/fw-version.fth Tue Jun 28 21:37:49 2011 (r2318) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 12 +macro: FW_MINOR 13

1 0

[commit] r2317 - dev/olpc/keyboard
by repository service 28 Jun '11

28 Jun '11

Author: wmb Date: Tue Jun 28 21:32:22 2011 New Revision: 2317 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2317 Log: OLPC keyboard selftest - to test for the presence of /ec-spi, use locate-device instead of find-package, because the latter searches the dropin driver list to find possible demand-loadable packages. That has the bad effect of starving the EC of cycles while the SPI FLASH behind the EC is being accessed. Also, do the presence test once when the test is started and cache the result in a value, thus reducing the "dead time" between polls. Modified: dev/olpc/keyboard/selftest.fth Modified: dev/olpc/keyboard/selftest.fth ============================================================================== --- dev/olpc/keyboard/selftest.fth Tue Jun 28 18:57:21 2011 (r2316) +++ dev/olpc/keyboard/selftest.fth Tue Jun 28 21:32:22 2011 (r2317) @@ -664,18 +664,17 @@ then ( false | scancode true ) ; +0 value ec-spi-buttons? + \ Check for a change in button state if necessary. : or-button? ( [scancode] key? -- [scancode] flag ) \ If there is already a key from get-data?, handle it before checking the game buttons - dup if exit then ( [scancode] key? phandle ) + dup if exit then ( false ) \ If the /ec-spi device node is present, the game buttons are directly connected \ so we must handle them here. Otherwise the EC will handle them and fold their \ events into the keyboard scancode stream. - " /ec-spi" find-package if ( false phandle ) - 2drop ( ) - button-event? ( [scancode] flag ) - then ( [scancode] flag ) + ec-spi-buttons? if drop button-event? then ; 0 value last-timestamp @@ -729,6 +728,13 @@ : selftest ( -- error? ) open 0= if true exit then + " /ec-spi" locate-device if ( ) + false ( flag ) + else ( phandle ) + drop true ( flag ) + then ( flag ) + to ec-spi-buttons? ( ) + set-keyboard-type make-keys

1 0

[commit] r2316 - dev/olpc/keyboard
by repository service 28 Jun '11

28 Jun '11

Author: wmb Date: Tue Jun 28 18:57:21 2011 New Revision: 2316 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2316 Log: OLPC keyboard selftest - poll the keyboard rapidly, but the ec-spi game keys only once every 20 ms. This solves the problem with EC starvation without causing loss of keyboard events. Tested on XO-1.5 and XO-1.75. Modified: dev/olpc/keyboard/selftest.fth Modified: dev/olpc/keyboard/selftest.fth ============================================================================== --- dev/olpc/keyboard/selftest.fth Tue Jun 28 00:27:51 2011 (r2315) +++ dev/olpc/keyboard/selftest.fth Tue Jun 28 18:57:21 2011 (r2316) @@ -617,6 +617,16 @@ then ( scancode ) ; +0 value button-poll-time +: okay-to-poll? ( -- flag ) + button-poll-time 0= get-msecs button-poll-time - 0>= or if + get-msecs d# 20 + to button-poll-time + true + else + false + then +; + \ Returns the next button-related scancode byte. : button-event? ( -- false | scancode true ) \ Handle the suffix of an e0-scancode sequence @@ -625,14 +635,16 @@ exit ( -- scancode true ) then ( ) - \ If the pending-buttons change mask is 0, we don't have anymore + \ If the pending-buttons change mask is 0, we don't have any more \ events to generate from the last time around, so reread the \ game buttons and set pending-buttons to the ones that have \ changed. pending-buttons 0= if - game-key@ ( new-buttons ) - dup last-buttons xor to pending-buttons ( new-buttons ) - to last-buttons ( ) + okay-to-poll? if + game-key@ ( new-buttons ) + dup last-buttons xor to pending-buttons ( new-buttons ) + to last-buttons ( ) + then then \ If there are bits set in pending-buttons, generate an event from @@ -685,7 +697,6 @@ get-msecs last-timestamp - d# 10,000 >= then then ( exit? ) - d# 20 ms until begin get-data? while drop repeat ;

1 0

[commit] r2315 - in cpu: arm/olpc/1.75 x86/pc/olpc
by repository service 28 Jun '11

28 Jun '11

Author: wmb Date: Tue Jun 28 00:27:51 2011 New Revision: 2315 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2315 Log: OLPC XO-1.75 - auto-reflash EC firmware if it is out of date. Added: cpu/arm/olpc/1.75/ec-version.fth cpu/arm/olpc/1.75/ec.bth Modified: cpu/arm/olpc/1.75/ecflash.fth cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/1.75/olpc.bth cpu/x86/pc/olpc/security.fth Added: cpu/arm/olpc/1.75/ec-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/ec-version.fth Tue Jun 28 00:27:51 2011 (r2315) @@ -0,0 +1,7 @@ +\ The EC microcode +macro: EC_VERSION 4_0_1_01 + +\ Alternate command for getting EC microcode, for testing new versions. +\ Temporarily uncomment the line and modify the path as necessary +\ macro: GET_EC cp ~rsmith/olpc/ec/ec-code15/image/ecimage.bin ec.img +\ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_test.img -O ec.img Added: cpu/arm/olpc/1.75/ec.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/ec.bth Tue Jun 28 00:27:51 2011 (r2315) @@ -0,0 +1,18 @@ +purpose: Fetch the EC (Embedded Controller, i.e. KB3700) microcode + +command: &builder &this +build-now + +fload ${BP}/cpu/arm/olpc/1.75/ec-version.fth + +\ If there is a GET_EC macro, use it instead of fetching the released version. +" ${GET_EC}" expand$ nip [if] + " ${GET_EC}" expand$ $sh +[else] + " wget -q http://dev.laptop.org/pub/ec/cl2-${EC_VERSION}.img -O ec.img" expand$ $sh +[then] + +\ This forces the creation of an ec.log file, so we don't re-fetch ec.img +writing ec.version +" ${EC_VERSION}"n" expand$ ofd @ fputs +ofd @ fclose Modified: cpu/arm/olpc/1.75/ecflash.fth ============================================================================== --- cpu/arm/olpc/1.75/ecflash.fth Mon Jun 27 22:49:20 2011 (r2314) +++ cpu/arm/olpc/1.75/ecflash.fth Tue Jun 28 00:27:51 2011 (r2315) @@ -52,11 +52,11 @@ abort" Miscompare!" cr [ifndef] cl2-a1 - ." Restarting EC and powering off" cr - d# 3000 ms + ." Restarting EC and rebooting" cr + d# 2000 ms unreset-8051 [then] - reset-ec + ec-power-cycle ; : flash-ec ( "filename" -- ) get-ec-file ?enough-power reflash-ec ; : flash-ec! ( "filename" -- ) get-ec-file reflash-ec ; @@ -76,6 +76,35 @@ load-base /ec-flash ofd @ fputs ofd @ fclose ; +: ec-up-to-date? ( img$ -- flag ) + \ If the new image has an invalid length, the old one is considered up to date + dup /ec-flash <> if + ." Invalid EC image length" cr 2drop true exit + then ( adr len ) + + h# 100 - cscount ( version&date$ ) + \ If the new image has an invalid signature, the old one is considered up to date + dup d# 25 < if 2drop true exit then ( version&date$ ) + bl left-parse-string " XO-EC" $= 0= if 2drop true exit then ( version&date$ ) + bl left-parse-string " 4" $= 0= if 2drop true exit then ( version&date$ ) + bl left-parse-string 2nip ( version$ ) + ec-name$ $caps-compare 0<= ( flag ) +; +: ?update-ec-flash ( -- ) + " ecimage.bin" find-drop-in if ( adr len ) + 2dup ec-up-to-date? if ( adr len ) + free-mem ( ) + else ( adr len ) + 2dup load-base swap move ( adr len ) + free-mem ( ) + ['] ?enough-power catch ?dup if ( error ) + .error + ." Skipping EC reflash" cr + else + reflash-ec + then + then + then +; \ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Mon Jun 27 22:49:20 2011 (r2314) +++ cpu/arm/olpc/1.75/fw.bth Tue Jun 28 00:27:51 2011 (r2315) @@ -405,6 +405,8 @@ read-game-keys + ?update-ec-flash + factory-test? if text-off then " probe-" do-drop-in Modified: cpu/arm/olpc/1.75/olpc.bth ============================================================================== --- cpu/arm/olpc/1.75/olpc.bth Mon Jun 27 22:49:20 2011 (r2314) +++ cpu/arm/olpc/1.75/olpc.bth Tue Jun 28 00:27:51 2011 (r2315) @@ -1,6 +1,7 @@ purpose: Construct the Open Firmware module collection command: &builder &this +in: ${BP}/cpu/arm/olpc/1.75/build/ec.img in: ${BP}/cpu/arm/olpc/1.75/build/fw.img in: ${BP}/cpu/arm/olpc/1.75/build/resetvec.img in: ${BP}/cpu/arm/olpc/1.75/build/mcastnand.bin @@ -150,6 +151,7 @@ " ${BP}/cpu/x86/pc/olpc/images/tux.565" " tux.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/settings.565" " settings.565" $add-deflated-dropin [then] + " ec.img" " ecimage.bin" $add-deflated-dropin .( Dropin top is ) ofd @ fsize .x cr Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Mon Jun 27 22:49:20 2011 (r2314) +++ cpu/x86/pc/olpc/security.fth Tue Jun 28 00:27:51 2011 (r2315) @@ -906,16 +906,6 @@ ; [ifdef] reflash-ec -: ec-up-to-date? ( img$ -- flag ) - /ec-flash <> if show-x " Invalid EC Firmware image" .security-failure then ( adr ) - /ec-flash + h# 100 - cscount ( version&date$ ) - \ If the new image has an invalid signature, the old one is considered up to date - dup d# 25 < if 2drop true exit then ( version&date$ ) - over " XO-EC 4 " comp if 2drop true exit then ( version&date$ ) - bl right-split-string 2drop ( date$ ) - d# 16 <> if 2drop true exit then ( date-adr ) - ec-date$ comp 0<= ( flag ) -; defer ec-reflash-off? ' false to ec-reflash-off? : do-ec-update ( img$ -- )

1 0

[commit] r2314 - forth/lib
by repository service 27 Jun '11

27 Jun '11

Author: wmb Date: Mon Jun 27 22:49:20 2011 New Revision: 2314 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2314 Log: Added $compare and $caps-compare for lexicographic string comparision considering both string contents and length. Modified: forth/lib/stringop.fth Modified: forth/lib/stringop.fth ============================================================================== --- forth/lib/stringop.fth Mon Jun 27 18:54:07 2011 (r2313) +++ forth/lib/stringop.fth Mon Jun 27 22:49:20 2011 (r2314) @@ -108,6 +108,59 @@ until then then ( adr ) here over - ; +\ The result is < = > zero when $1 is < = > $2 +: $compare ( $1 $2 -- -1|0|1 ) + rot ( adr1 adr2 len2 len1 ) + 2dup = if ( adr1 adr2 len2 len1 ) + \ The strings are the same length, so consider only their contents + drop comp ( -1|0|1 ) + else ( adr1 adr2 len2 len1 ) + \ The lengths differ, so consider both contents and length + \ First consider the contents within the length of the shorter string + 2>r 2r@ min ( adr1 adr2 min-len r: len2 len1 ) + comp ?dup if ( -1|1 r: len2 len1 ) + \ The initial substrings differ, determining the answer + 2r> 2drop ( -1|1 ) + else ( r: len2 len1 ) + \ The initial substring are the same, so the longer string is ">" + 2r> swap ( len1 len2 ) + < if -1 else 1 then ( -1|1 ) + then + then +; +\ The result is < = > zero when $1 is < = > $2 +: $caps-compare ( $1 $2 -- -1|0|1 ) + rot ( adr1 adr2 len2 len1 ) + 2dup = if ( adr1 adr2 len2 len1 ) + \ The strings are the same length, so consider only their contents + drop caps-comp ( -1|0|1 ) + else ( adr1 adr2 len2 len1 ) + \ The lengths differ, so consider both contents and length + \ First consider the contents within the length of the shorter string + 2>r 2r@ min ( adr1 adr2 min-len r: len2 len1 ) + caps-comp ?dup if ( -1|1 r: len2 len1 ) + \ The initial substrings differ, determining the answer + 2r> 2drop ( -1|1 ) + else ( r: len2 len1 ) + \ The initial substring are the same, so the longer string is ">" + 2r> swap ( len1 len2 ) + < if -1 else 1 then ( -1|1 ) + then + then +; +0 [if] \ Test cases +" " " " $compare . +" a" " a" $compare . +" a" " b" $compare . +" a" " ab" $compare . +" b" " a" $compare . +" b" " ab" $compare . +" a" " a" $caps-compare . +" a" " B" $caps-compare . +" a" " Ba" $caps-compare . +" B" " a" $caps-compare . +" B" " ab" $caps-compare . +[then] \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware